mastodon/app/views
Claire 3d25fe0426 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `.github/workflows/build-image.yml`:
  Upstream changed the workflow a bit.
  Conflict comes from us pushing to ghcr while upstream pushes to dockerhub.
  Ported the upstream changes while still pushing to ghcr.
2022-02-23 18:13:12 +01:00
..
about
accounts
admin Merge branch 'main' into glitch-soc/merge-upstream 2022-02-22 18:06:29 +01:00
admin_mailer Fix link in new hashtag notification email (#17624) 2022-02-23 16:51:09 +01:00
application
auth Merge branch 'main' into glitch-soc/merge-upstream 2022-02-17 10:58:44 +01:00
authorize_interactions
directories
disputes/strikes Fix link colors in report and strike details (#17616) 2022-02-22 15:27:25 +01:00
errors
filters
follower_accounts
following_accounts
home
invites
kaminari
layouts Merge branch 'main' into glitch-soc/merge-upstream 2022-02-17 10:58:44 +01:00
media
notification_mailer
oauth
public_timelines
relationships
remote_follow
remote_interaction
settings Merge branch 'main' into glitch-soc/merge-upstream 2022-02-17 10:58:44 +01:00
shared
shares
statuses Merge branch 'main' into glitch-soc/merge-upstream 2022-02-17 10:58:44 +01:00
statuses_cleanup
tags
user_mailer Add appeals (#17364) 2022-02-14 21:27:53 +01:00
well_known/host_meta