mastodon/app/views
Thibaut Girka 48f0f3ffee Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `.github/ISSUE_TEMPLATE/bug_report.md`:
  Upstream added the `bug` label to bug reports.
  Did the same.
- `app/services/fan_out_on_write_service.rb`:
  Upstream put DMs back into timelines, glitch-soc was already doing it.
  Ignored upstream changes.
2020-11-20 13:27:48 +01:00
..
about
accounts
admin
admin_mailer
application
auth
authorize_interactions
directories
errors
filters
follower_accounts
following_accounts
home Merge branch 'master' into glitch-soc/merge-upstream 2020-11-07 18:23:02 +01:00
invites
kaminari Pagination improvements (#1445) 2017-04-11 01:11:41 +02:00
layouts
media
notification_mailer
oauth
public_timelines
relationships
remote_follow
remote_interaction
settings Merge branch 'master' into glitch-soc/merge-upstream 2020-11-20 13:27:48 +01:00
shared
shares
statuses
tags
user_mailer Add WebAuthn as an alternative 2FA method (#14466) 2020-08-24 16:46:27 +02:00
well_known/host_meta