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 aa832d623a Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `CHANGELOG.md`: Upstream added newlines. Conflicts are because the CHANGELOG was independently merged from 3.4.6 on last security update. Took upstream's version. - `app/helpers/context_helper.rb`: Conflicts because of extra vocabulary in glitch-soc. The conflicts were actually handled in last security merge. Kept our version.		3 years ago
..
ISSUE_TEMPLATE	Better ordering for bug report issue template (#17019)	3 years ago
workflows	Merge branch 'main' into glitch-soc/merge-upstream	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