mastodon/config
Claire 45e56db8e4 Merge commit 'f89512fbedb547f66a72eefdff047768fb505eb6' into glitch-soc/merge-upstream
Conflicts:
- `README.md`:
  Upstream updated its README, we have a completely different one.
  Kept our version.
2024-03-05 16:25:50 +01:00
..
environments
imagemagick
initializers Merge commit 'f89512fbedb547f66a72eefdff047768fb505eb6' into glitch-soc/merge-upstream 2024-03-05 16:25:50 +01:00
locales
locales-glitch
routes
templates
webpack
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
secrets.yml
settings.yml
sidekiq.yml
storage.yml
webpacker.yml