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
..
controllers	Merge branch 'main' into glitch-soc/merge-upstream	2022-10-30 18:15:28 +01:00
fabricators
features
fixtures
helpers
lib
mailers
models
policies
presenters
requests
routing
serializers/activitypub
services
support
validators
views/statuses
workers
rails_helper.rb
spec_helper.rb