Glitch-Shrike/config
Claire 83480df820 Merge commit 'b42661ba95b7872ba278fca9b0fee8faffd89e52' into glitch-soc/merge-upstream
Conflicts:
- `lib/sanitize_ext/sanitize_config.rb`:
  Upstream added `<s>` to the list of allowed tags, the conflict is because
  we have a different list of allowed tags.
  Added `<s>` like upstream did.
2024-08-12 17:46:24 +02:00
..
environments
imagemagick
initializers Merge commit 'b42661ba95b7872ba278fca9b0fee8faffd89e52' into glitch-soc/merge-upstream 2024-08-12 17:46:24 +02:00
locales
locales-glitch
routes
templates
webpack
application.rb
boot.rb
brakeman.yml
database.yml
environment.rb
formatjs-formatter.js
i18n-tasks.yml
navigation.rb Merge commit 'b42661ba95b7872ba278fca9b0fee8faffd89e52' into glitch-soc/merge-upstream 2024-08-12 17:46:24 +02:00
pghero.yml
puma.rb
roles.yml
routes.rb
secrets.yml
settings.yml
sidekiq.yml
storage.yml
webpacker.yml