mastodon/app/views
Claire 7782e4dc0d Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `app/controllers/about_controller.rb`:
  Minor conflict caused by glitch-soc's theming system.
  Ported upstream changes.
2020-12-10 09:41:49 +01:00
..
about Merge branch 'master' into glitch-soc/merge-upstream 2020-12-10 09:41:49 +01:00
accounts
admin
admin_mailer
application
auth Merge branch 'master' into glitch-soc/merge-upstream 2020-12-10 09:41:49 +01:00
authorize_interactions
directories
errors
filters
follower_accounts
following_accounts
home
invites
kaminari
layouts
media
notification_mailer
oauth
public_timelines
relationships
remote_follow
remote_interaction
settings
shared
shares
statuses
tags
user_mailer
well_known/host_meta