mirror of
https://github.com/glitch-soc/mastodon.git
synced 2024-11-27 10:30:15 -05:00
48f0f3ffee
Conflicts: - `.github/ISSUE_TEMPLATE/bug_report.md`: Upstream added the `bug` label to bug reports. Did the same. - `app/services/fan_out_on_write_service.rb`: Upstream put DMs back into timelines, glitch-soc was already doing it. Ignored upstream changes. |
||
---|---|---|
.. | ||
ISSUE_TEMPLATE | ||
CODEOWNERS | ||
FUNDING.yml | ||
stale.yml |