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
..
environments	Merge branch 'main' into glitch-soc/merge-upstream	2023-01-10 14:43:38 +01:00
initializers
locales	Add option to make the landing page be /about even when trends are enabled (#20808)	2023-01-18 16:43:58 +01:00
locales-glitch	New Crowdin updates (#2069)	2023-01-18 15:50:50 +01:00
webpack
application.rb
boot.rb
brakeman.ignore
database.yml
deploy.rb
environment.rb
i18n-tasks.yml	Merge branch 'main' into glitch-soc/merge-upstream	2023-01-18 17:38:11 +01:00
navigation.rb
pghero.yml
puma.rb
roles.yml
routes.rb	Merge branch 'main' into glitch-soc/merge-upstream	2023-01-18 17:38:11 +01:00
secrets.yml
settings.yml	Merge branch 'main' into glitch-soc/merge-upstream	2023-01-18 17:38:11 +01:00
sidekiq.yml
storage.yml
webpacker.yml