mastodon/app/views
Claire eee36267d6 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/javascript/mastodon/locales/ja.json`:
  Upstream change too close to a glitch-soc-specific string.
  The glitch-soc-specific string should not have been in this file, so it
  has been moved to `app/javascript/flavours/glitch/locales/ja.js`.
- `app/javascript/packs/public.js`:
  Upstream refactored a part, that as usual is split and duplicated in various
  pack files. Updated those pack files accordingly.
- `app/views/layouts/application.html.haml`:
  Upstream fixed custom.css path in a different way than we did, went with
  upstream's change.
2022-10-30 18:15:28 +01:00
..
about
…
accounts
…
admin
…
admin_mailer
…
application
…
auth
…
authorize_interactions
…
custom_css
…
disputes/strikes
…
errors
…
filters
…
follower_accounts
…
following_accounts
…
home
…
invites
…
kaminari
…
layouts Merge branch 'main' into glitch-soc/merge-upstream 2022-10-30 18:15:28 +01:00
media
…
notification_mailer
…
oauth
…
privacy
…
relationships
…
settings
…
shared
…
shares
…
statuses
…
statuses_cleanup
…
tags
…
user_mailer
…
well_known/host_meta
…