You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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.		3 years ago
..
ISSUE_TEMPLATE	Replace to issue form (#16429)	3 years ago
workflows	Fix spelling error in i18n workflow (#16326)	3 years ago
CODEOWNERS	Change references to tootsuite/mastodon to mastodon/mastodon (#16491)	3 years ago
FUNDING.yml	Add GitHub Sponsors	4 years ago
stale.yml	Change stale bot to only touch pull requests over 120 days old (#12217)	5 years ago