Claire aaace9f1db 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.		2022-02-06 15:34:42 +01:00
..
ISSUE_TEMPLATE	Better ordering for bug report issue template (#17019)	2021-11-24 20:24:09 +01:00
workflows	Merge branch 'main' into glitch-soc/merge-upstream	2022-02-06 15:34:42 +01: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