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	Merge branch 'main' into glitch-soc/merge-upstream	2021-04-20 12:17:14 +02:00
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	New Crowdin updates (#16269)	2021-05-20 00:19:52 +02:00
boot.rb
brakeman.ignore	Ignore brakeman false positive warning (#16213)	2021-05-11 14:18:33 +02:00
database.yml
deploy.rb	Bump capistrano from 3.15.0 to 3.16.0 (#15818)	2021-03-05 06:38:52 +09:00
environment.rb
i18n-tasks.yml
navigation.rb	Merge branch 'main' into glitch-soc/merge-upstream	2021-04-20 12:17:14 +02:00
pghero.yml
puma.rb
routes.rb	Merge branch 'main' into glitch-soc/merge-upstream	2021-05-07 18:21:59 +02:00
secrets.yml
settings.yml	Merge branch 'main' into glitch-soc/merge-upstream	2021-05-07 18:21:59 +02:00
sidekiq.yml	Add cold-start follow recommendations (#15945)	2021-04-12 12:37:14 +02:00
storage.yml	Update Mastodon to Rails 6.1 (#15910)	2021-03-24 10:44:31 +01:00
webpacker.yml