Claire 59864ff495 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `.github/dependabot.yml`: Upstream modified it, but we deleted it in glitch-soc. Keep it deleted.		2022-03-22 17:00:38 +01:00
..
environments	Merge branch 'main' into glitch-soc/merge-upstream	2022-01-28 08:58:32 +01:00
initializers	Merge branch 'main' into glitch-soc/merge-upstream	2022-03-15 20:45:27 +01:00
locales	New Crowdin updates (#17817)	2022-03-20 00:23:01 +09:00
locales-glitch	Fix blank screen when trying to copy emoji with a too large file size (#1718)	2022-03-14 17:34:53 +01:00
webpack	Add support for multiple source files per pack	2022-02-12 00:10:28 +01:00
application.rb	Fix wrong language code for Kurdish languages (#17812)	2022-03-17 01:37:03 +01:00
boot.rb	Bump bootsnap from 1.6.0 to 1.8.1 (#16677)	2021-09-19 14:42:32 +09:00
brakeman.ignore	Fix IDN domains not being rendered correctly in a few left-over places (#17848)	2022-03-22 10:07:11 +01:00
database.yml	Format JSON and YAML using Prettier (#17823)	2022-03-21 04:46:11 +01:00
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 'main' into glitch-soc/merge-upstream	2022-03-22 17:00:38 +01:00
navigation.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-02-26 09:29:23 +01:00
pghero.yml
puma.rb
routes.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-03-10 09:52:45 +01:00
secrets.yml
settings.yml	Merge branch 'main' into glitch-soc/merge-upstream	2022-03-08 20:22:54 +01:00
sidekiq.yml	Change frequency of trends review notifications from 2 hours to 6 hours (#17850)	2022-03-22 11:58:25 +01:00
storage.yml
webpacker.yml