mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-12-20 21:58:09 +00:00
Conflicts: - `.github/ISSUE_TEMPLATE/1.web_bug_report.yml`: We don't use the github features that upstream does, so kept our version. - `.github/ISSUE_TEMPLATE/2.server_bug_report.yml`: We don't use the github features that upstream does, so kept our version.