Claire 9f92b05bd2 Merge commit '2e6bf60f1549e5c1f1cfea2d614f978bea17b8a2' into glitch-soc/merge-upstream ...

Conflicts:
- `README.md`:
  Upstream has updated their README but we have a completely different one.
  Kept our version of `README.md`

2023-12-10 18:05:02 +01:00

..

environments

Merge commit '9a3d047f3e604e581e18346424569e28fc9c5b96' into glitch-soc/merge-upstream

2023-10-25 19:59:17 +02:00

imagemagick

…

initializers

Merge commit '2e6bf60f1549e5c1f1cfea2d614f978bea17b8a2' into glitch-soc/merge-upstream

2023-12-10 18:05:02 +01:00

locales

New Crowdin Translations (automated) (#27583)

2023-10-27 09:38:04 +00:00

locales-glitch

Fix i18n unused check being tripped by no in YAML files (#2496)

2023-12-03 11:21:34 +01:00

routes

…

webpack

…

application.rb

Use Rails.env.local? shorthand method to check env (#27519)

2023-10-26 21:20:41 +00:00

boot.rb

…

brakeman.yml

…

database.yml

…

deploy.rb

…

environment.rb

…

formatjs-formatter.js

…

i18n-tasks.yml

Merge commit '2e6bf60f1549e5c1f1cfea2d614f978bea17b8a2' into glitch-soc/merge-upstream

2023-12-10 18:05:02 +01:00

navigation.rb

…

pghero.yml

…

puma.rb

…

roles.yml

…

routes.rb

Merge commit '2e6bf60f1549e5c1f1cfea2d614f978bea17b8a2' into glitch-soc/merge-upstream

2023-12-10 18:05:02 +01:00

secrets.yml

…

settings.yml

…

sidekiq.yml

…

storage.yml

…

webpacker.yml

…