Claire ab59743c13 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/views/layouts/mailer.html.haml`: Upstream removed a line close to one modified by glitch-soc. Removed the line as upstream did.		2023-01-14 22:34:09 +01:00
..
environments
initializers
locales	Change confirm prompt for relationships management (#19411)	2023-01-14 14:00:23 +01:00
locales-glitch
webpack
application.rb
boot.rb
brakeman.ignore	Fix IDN domains not being rendered correctly in a few left-over places (#17848)	2022-03-22 10:07:11 +01:00
database.yml
deploy.rb
environment.rb
i18n-tasks.yml
navigation.rb
pghero.yml
puma.rb
roles.yml
routes.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-14 20:27:31 +01:00
secrets.yml
settings.yml
sidekiq.yml
storage.yml
webpacker.yml