Glitch-Shrike/config
Claire 630b245bb4 Merge commit '9a73a7dcaf2e383b2ec105d71bfcea2c48cbea10' into glitch-soc/merge-upstream
Conflicts:
- `app/lib/settings/scoped_settings.rb`:
  Removed upstream, while glitch-soc had a change related to its theming system.
  Removed as well, as it's unused.
2024-01-11 12:59:27 +01:00
..
environments Merge commit '0b4a3a04378ce43f2f314b9446b5053f6b374c6d' into glitch-soc/merge-upstream 2023-12-20 22:16:50 +01:00
imagemagick
initializers Merge commit '9a73a7dcaf2e383b2ec105d71bfcea2c48cbea10' into glitch-soc/merge-upstream 2024-01-11 12:59:27 +01:00
locales New Crowdin Translations (automated) (#28660) 2024-01-09 11:48:19 +00:00
locales-glitch
routes Merge branch 'main' into glitch-soc/merge-upstream 2023-12-28 16:57:10 +01:00
webpack Merge commit 'a0e237a96fca2774d3c9ed43063a45e395bb7f40' into glitch-soc/merge-upstream 2024-01-10 18:26:47 +01:00
application.rb Enable Rails 7.1 Marshalling format (#28609) 2024-01-05 21:57:47 +00:00
boot.rb
brakeman.yml
database.yml
deploy.rb
environment.rb
formatjs-formatter.js
i18n-tasks.yml Merge commit '0b4a3a04378ce43f2f314b9446b5053f6b374c6d' into glitch-soc/merge-upstream 2023-12-20 22:16:50 +01:00
navigation.rb
pghero.yml
puma.rb
roles.yml
routes.rb Merge commit 'f99e05710ea06cf10bbd3fb64ae8c00b095cb455' into glitch-soc/merge-upstream 2023-12-21 19:24:10 +01:00
secrets.yml
settings.yml
sidekiq.yml
storage.yml
webpacker.yml