mastodon/app/views
Claire d1780fb9a4 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `.github/ISSUE_TEMPLATE/bug_report.md`:
  Removed upstream, while we had a checkbox telling people to check if the
  issue was present upstream. Removed the file as well.
2021-06-30 00:42:52 +02:00
..
about
accounts
admin
admin_mailer
application
auth
authorize_interactions
directories
errors
filters
follower_accounts
following_accounts
home
invites
kaminari
layouts Merge branch 'main' into glitch-soc/merge-upstream 2021-06-30 00:42:52 +02:00
media
notification_mailer
oauth
public_timelines
relationships
remote_follow
remote_interaction
settings
shared
shares
statuses
tags
user_mailer
well_known/host_meta