Glitch-Shrike/config
Claire 0e74d4da59 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `.github/dependabot.yml`:
  Changed upstream, while we modified it in glitch-soc to not get spammed
  by dependabot.
  Kept it removed.
- `README.md`:
  Changed upstream, which has a very different version.
  Discarded upstream changes.
2022-06-21 08:28:59 +02:00
..
environments
initializers Merge branch 'main' into glitch-soc/merge-upstream 2022-06-02 09:49:38 +02:00
locales New Crowdin updates (#18605) 2022-06-16 13:31:19 +09:00
locales-glitch Make “Flavour and skin” admin setting label translatable (#1791) 2022-05-31 16:52:52 +02:00
webpack
application.rb
boot.rb
brakeman.ignore
database.yml
deploy.rb
environment.rb
i18n-tasks.yml
navigation.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-06-10 11:51:43 +02:00
pghero.yml
puma.rb
routes.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-06-10 11:51:43 +02:00
secrets.yml
settings.yml
sidekiq.yml
storage.yml
webpacker.yml