Claire 6e56f95285 Merge commit '4a7395d989e40c3bd4ef18173aa5ea850c8ddcdd' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Upstream modified its README, we have a completely different one. Kept our README file.		2023-12-21 18:17:17 +01:00
..
environments	Merge commit '0b4a3a04378ce43f2f314b9446b5053f6b374c6d' into glitch-soc/merge-upstream	2023-12-20 22:16:50 +01:00
imagemagick	…
initializers	Fix lint issue in glitch-soc-only file	2023-12-20 22:25:23 +01:00
locales	…
locales-glitch	…
routes	…
webpack	…
application.rb	…
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	…
secrets.yml	…
settings.yml	…
sidekiq.yml	…
storage.yml	…
webpacker.yml	…