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
..
ISSUE_TEMPLATE	Replace to issue form (#16429)	2021-06-25 15:01:52 +02:00
workflows	Fix spelling error in i18n workflow (#16326)	2021-06-01 05:18:32 +02:00
CODEOWNERS	Change references to tootsuite/mastodon to mastodon/mastodon (#16491)	2021-07-13 15:46:20 +02:00
FUNDING.yml	Add GitHub Sponsors	2020-06-29 16:10:49 +02:00
stale.yml	Change stale bot to only touch pull requests over 120 days old (#12217)	2019-10-26 12:45:52 +02:00