Claire b2eaf5562d Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Upstream added some documentation in the README, but our README is pretty different and barebone. Kept our README.		2021-10-14 22:14:26 +02:00
..
environments	Merge branch 'main' into glitch-soc/merge-upstream	2021-10-14 22:14:26 +02:00
initializers	Merge branch 'main' into glitch-soc/merge-upstream	2021-10-14 22:14:26 +02:00
locales	Allow keeping only 1 boosts/favs on auto deleting posts (#16653)	2021-10-14 21:11:14 +02:00
locales-glitch	Add zh-CN translations	2021-10-07 23:40:18 +02:00
webpack	Merge branch 'main' into glitch-soc/merge-upstream	2021-09-02 10:52:09 +02:00
application.rb	Add Northern Kurdish locale as requested by translator. It already has a project started on Crowdin. (#16548)	2021-10-14 21:02:54 +02:00
boot.rb	Bump bootsnap from 1.6.0 to 1.8.1 (#16677)	2021-09-19 14:42:32 +09:00
brakeman.ignore	Ignore brakeman false positive warning (#16213)	2021-05-11 14:18:33 +02:00
database.yml
deploy.rb	Change references to tootsuite/mastodon to mastodon/mastodon (#16491)	2021-07-13 15:46:20 +02:00
environment.rb
i18n-tasks.yml	Merge branch 'master' into glitch-soc/merge-upstream	2020-07-01 19:23:14 +02:00
navigation.rb	Merge branch 'main' into glitch-soc/merge-upstream	2021-08-09 23:25:49 +02:00
pghero.yml	Fix PgHero Content-Security-Policy when CDN_HOST is used (#13595)	2020-05-04 13:52:41 +02:00
puma.rb
routes.rb	Merge branch 'main' into glitch-soc/merge-upstream	2021-10-14 21:44:57 +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 feature to automatically delete old toots (#16529)	2021-08-09 23:11:50 +02:00
storage.yml	Update Mastodon to Rails 6.1 (#15910)	2021-03-24 10:44:31 +01:00
webpacker.yml