mastodon/app/views
Thibaut Girka 1d6152f440 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- config/locales/en.yml
  Conflict caused by the glitch-soc-specific “flavour” string being too close
  to the newly introduced “identity_proofs” string. Just included both.
2019-03-20 13:54:00 +01:00
..
about Merge branch 'master' into glitch-soc/merge-upstream 2019-03-20 13:54:00 +01:00
accounts Merge branch 'master' into glitch-soc/merge-upstream 2019-03-20 13:54:00 +01:00
admin
admin_mailer
application
auth
authorize_interactions
directories
errors
filters
follower_accounts
following_accounts
home
invites
kaminari
layouts
media
notification_mailer
oauth
public_timelines
relationships
remote_follow
remote_interaction
remote_unfollows
settings Merge branch 'master' into glitch-soc/merge-upstream 2019-03-20 13:54:00 +01:00
shared
shares
stream_entries
tags
user_mailer
well_known