Claire 60abcb3c4c Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `config/i18n-tasks.yml`: Upstream added new ignored strings, glitch-soc has extra ignored strings because of the theming system. Added upstream's changes.		2023-01-18 17:38:11 +01:00
..
config/initializers	…
controllers	Merge branch 'main' into glitch-soc/merge-upstream	2023-01-18 17:38:11 +01:00
fabricators	…
features	…
fixtures	Change domain block CSV parsing to be more robust and handle more lists (#21470)	2023-01-18 16:20:52 +01:00
helpers	…
lib	Merge branch 'main' into glitch-soc/merge-upstream	2023-01-12 10:15:46 +01:00
mailers	…
models	…
policies	…
presenters	…
requests	…
routing	…
serializers/activitypub	…
services	Merge branch 'main' into glitch-soc/merge-upstream	2023-01-18 17:38:11 +01:00
support	…
validators	…
views/statuses	…
workers	…
rails_helper.rb	…
spec_helper.rb	…