mastodon/app/views
Thibaut Girka c077cdaba7 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `app/controllers/relationships_controller.rb`:
  Upstream changed a line too close to a glitch-soc only line related to
  glitch-soc's theming system.
  Applied upstream changes accordingly.
2020-11-12 22:13:57 +01:00
..
about
accounts
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 Merge branch 'master' into glitch-soc/merge-upstream 2020-11-12 22:13:57 +01:00
remote_follow
remote_interaction
settings
shared
shares
statuses
tags
user_mailer
well_known/host_meta