Claire 6c20dad201 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Upstream updated its README, while we have a completely different one. Kept our README. - `app/controllers/concerns/web_app_controller_concern.rb`: Conflict because of glitch-soc's theming system. Additionally, glitch-soc has different behavior regarding moved accounts. Ported some of the changes, but kept our overall behavior. - `app/javascript/packs/admin.js`: Code changes actually applied to `app/javascript/core/admin.js`		2023-01-05 14:16:25 +01:00
..
config/initializers
controllers
fabricators
features
fixtures
helpers
lib	Merge branch 'main' into glitch-soc/merge-upstream	2023-01-05 14:16:25 +01:00
mailers
models	Merge branch 'main' into glitch-soc/merge-upstream	2023-01-05 14:16:25 +01:00
policies
presenters
requests
routing
serializers/activitypub
services	Merge branch 'main' into glitch-soc/merge-upstream	2023-01-05 14:16:25 +01:00
support
validators
views/statuses
workers
rails_helper.rb
spec_helper.rb