Claire fc500a6062 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `CONTRIBUTING.md`: Upstream file has changed and we're quoting it. Ported the changes. - `README.md`: Upstream file has changed but we have a completely different one. Kept our version. - `lib/mastodon/version.rb`: Upstream has changed from `tootsuite/mastodon` to `mastodon/mastodon`, but we're still `glitch-soc/mastodon`. Kept our version. - `spec/presenters/instance_presenter_spec.rb`: Upstream has changed from `tootsuite/mastodon` to `mastodon/mastodon`, but we're still `glitch-soc/mastodon`. Kept our version.		2021-07-13 17:57:15 +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	Add ability to filter reports by origin of target account (#16487)	2021-07-11 11:01:38 +02:00
locales-glitch	Glitchsoc translation to 'es' language (#1439)	2020-10-19 22:17:29 +02:00
webpack	Merge branch 'main' into glitch-soc/merge-upstream	2021-06-25 10:44:06 +02:00
application.rb	New Crowdin updates (#16269)	2021-05-20 00:19:52 +02:00
boot.rb	Add clean error message when RAILS_ENV is unset (#15381)	2020-12-20 18:05:03 +01: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	…
navigation.rb	Merge branch 'main' into glitch-soc/merge-upstream	2021-06-23 10:46:24 +02:00
pghero.yml	…
puma.rb	…
routes.rb	Merge branch 'main' into glitch-soc/merge-upstream	2021-07-08 16:17:19 +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	…