mastodon/app/views
Claire 5e11f3a6e1 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/javascript/styles/mastodon/modal.scss`:
  For some reason we changed the file loading path in glitch-soc,
  but now upstream has completely changed how the logo is loaded.
  Applied upstream changes.
2021-02-12 10:28:32 +01:00
..
about Merge branch 'master' into glitch-soc/merge-upstream 2020-12-19 00:55:12 +01:00
accounts
…
admin Merge branch 'master' into glitch-soc/merge-upstream 2021-01-06 18:08:06 +01:00
admin_mailer
…
application
…
auth Merge branch 'master' into glitch-soc/merge-upstream 2020-12-15 14:27:06 +01:00
authorize_interactions
…
directories
…
errors
…
filters
…
follower_accounts
…
following_accounts
…
home Merge branch 'main' into glitch-soc/merge-upstream 2021-01-21 16:51:12 +01:00
invites
…
kaminari
…
layouts Merge branch 'main' into glitch-soc/merge-upstream 2021-02-12 10:28:32 +01:00
media Merge branch 'master' into glitch-soc/merge-upstream 2021-01-06 18:08:06 +01:00
notification_mailer Change RTL detection to rely on unicode-bidi paragraph by paragraph (#14573) 2020-12-15 12:56:43 +01:00
oauth
…
public_timelines Merge branch 'main' into glitch-soc/merge-upstream 2021-01-21 16:51:12 +01:00
relationships
…
remote_follow
…
remote_interaction
…
settings
…
shared
…
shares
…
statuses Merge branch 'master' into glitch-soc/merge-upstream 2021-01-06 18:08:06 +01:00
tags Merge branch 'main' into glitch-soc/merge-upstream 2021-01-21 16:51:12 +01:00
user_mailer
…
well_known/host_meta
…