Claire 10a31a934f Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Upstream's README got updated, but we have a completely different one. Kept ours.		2021-05-27 17:58:44 +02:00
..
environments
initializers	Merge branch 'main' into glitch-soc/merge-upstream	2021-05-27 17:58:44 +02:00
locales	Fix some typos and improve some UI text (#16283)	2021-05-24 03:03:01 +02:00
locales-glitch
webpack
application.rb
boot.rb
brakeman.ignore
database.yml
deploy.rb
environment.rb
i18n-tasks.yml
navigation.rb
pghero.yml
puma.rb
routes.rb
secrets.yml
settings.yml
sidekiq.yml
storage.yml
webpacker.yml