Glitch-Shrike/app/models/concerns
Thibaut Girka a84aedb7a7 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/models/media_attachment.rb
  Upstream raised max image size from 8MB to 10MB while our limit is
  configurable. Raised the default to 10MB.
2019-10-03 11:10:12 +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
user_roles.rb