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. |
||
|---|---|---|
| .. | ||
| bug_report.md | ||
| config.yml | ||
| feature_request.md | ||
| support.md | ||