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.

Thibaut Girka 48f0f3ffee Merge branch 'master' into glitch-soc/merge-upstream ... 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.		4 years ago
..
bug_report.md	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
config.yml	Add config for issue template (#12306)	5 years ago
feature_request.md	Apply label automatically when issue creation from template (#15154)	4 years ago
support.md	…