Claire abfdafef1e Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/auth/setup_controller.rb`: Upstream removed a method close to a glitch-soc theming-related method. Removed the method like upstream did.		2023-04-22 10:06:11 +02:00
..
environments
initializers
locales	Add progress indicator to sign-up flow (#24545)	2023-04-16 07:01:24 +02:00
locales-glitch	New Crowdin updates (#2172)	2023-04-16 17:25:43 +02:00
webpack
application.rb
boot.rb
brakeman.ignore
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	2023-04-22 10:06:11 +02:00
secrets.yml
settings.yml
sidekiq.yml
storage.yml
webpacker.yml