Claire a3b6a85521 Merge commit 'cd37048439f9b324f48e6af1f426a7894c54b4da' into glitch-soc/merge-upstream ... Conflicts: - `.prettierignore`: Conflict due to glitch-soc-only files. Kept those at the end of the file.		2024-01-13 12:11:29 +01:00
..
chewy	…
config/initializers/rack	…
controllers	…
fabrication	…
fabricators	…
features	…
fixtures	…
generators	…
helpers	…
lib	…
locales	…
mailers	…
models	…
policies	…
presenters	…
requests	…
routing	…
search/models/concerns/account	…
serializers	…
services	…
support	…
system	…
validators	…
views	…
workers	…
rails_helper.rb	…
spec_helper.rb	…