Thibaut Girka f5f6d23d55 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - config/locales/pl.yml Conflict caused by new upstream string too close to glitch-specific “flavour” string. Took both strings.		2019-04-08 15:57:56 +02:00
..
account_associations.rb
account_avatar.rb
account_counters.rb
account_finder_concern.rb
account_header.rb
account_interactions.rb
attachmentable.rb
cacheable.rb
domain_normalizable.rb
expireable.rb
ldap_authenticable.rb
omniauthable.rb
paginable.rb
pam_authenticable.rb
redisable.rb
relationship_cacheable.rb
remotable.rb
status_threading_concern.rb
streamable.rb
user_roles.rb