glitch-social/config
Claire cd2ee0ec5f Merge commit '757d7c73c0ca3750ac9e74a7e962f71c535a7bd0' into glitch-soc/merge-upstream
Conflicts:
- `README.md`:
  Upstream updated its README, we have a completely different one.
  Kept ours.
- `yarn.lock`:
  Upstream changed from yarn 1 to yarn 4, but we had some different
  dependencies.
  Updated to yarn 4 and re-added our dependencies.
2023-12-18 18:25:33 +01:00
..
environments
imagemagick
initializers Merge commit '23e32a4b3031d1da8b911e0145d61b4dd47c4f96' into glitch-soc/merge-upstream 2023-12-18 18:07:24 +01:00
locales
locales-glitch
routes
webpack Merge commit '757d7c73c0ca3750ac9e74a7e962f71c535a7bd0' into glitch-soc/merge-upstream 2023-12-18 18:25:33 +01:00
application.rb
boot.rb
brakeman.yml
database.yml
deploy.rb
environment.rb
formatjs-formatter.js
i18n-tasks.yml
navigation.rb
pghero.yml
puma.rb
roles.yml
routes.rb Merge commit '23e32a4b3031d1da8b911e0145d61b4dd47c4f96' into glitch-soc/merge-upstream 2023-12-18 18:07:24 +01:00
secrets.yml
settings.yml
sidekiq.yml
storage.yml
webpacker.yml