Glitch-Shrike/config
Claire 59864ff495 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `.github/dependabot.yml`:
  Upstream modified it, but we deleted it in glitch-soc.
  Keep it deleted.
2022-03-22 17:00:38 +01:00
..
environments
initializers
locales
locales-glitch
webpack
application.rb
boot.rb
brakeman.ignore
database.yml
deploy.rb
environment.rb
i18n-tasks.yml Merge branch 'main' into glitch-soc/merge-upstream 2022-03-22 17:00:38 +01:00
navigation.rb
pghero.yml
puma.rb
routes.rb
secrets.yml
settings.yml
sidekiq.yml
storage.yml
webpacker.yml