mastodon/app/models/concerns
Thibaut Girka 6f75a9001f Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/views/stream_entries/_simple_status.html.haml
- config/locales/nl.yml

Deleted unused translation strings (themes) and adapted minor changes to
_simple_status.html.haml
2018-08-31 19:10:57 +02:00
..
account_avatar.rb
account_finder_concern.rb
account_header.rb
account_interactions.rb
attachmentable.rb
cacheable.rb
expireable.rb
omniauthable.rb
paginable.rb
relationship_cacheable.rb
remotable.rb
status_threading_concern.rb
streamable.rb