Claire 767630be24 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `Gemfile`: Upstream removed blank lines.		2022-11-14 20:27:31 +01:00
..
environments
initializers	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-14 20:27:31 +01:00
locales
locales-glitch
webpack
application.rb	Fix mailers queue not being used for mailers (#20274)	2022-11-10 02:31:09 +01:00
boot.rb
brakeman.ignore
database.yml
deploy.rb	Change master branch to main branch (#20290)	2022-11-10 04:02:05 +01:00
environment.rb	Make PreviewCard records reuseable between statuses (#4642)	2017-09-01 16:20:16 +02:00
i18n-tasks.yml
navigation.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-10-28 19:23:58 +02:00
pghero.yml
puma.rb	Add PERSISTENT_TIMEOUT option (#11756)	2019-09-04 20:44:08 +02:00
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