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
..
ISSUE_TEMPLATE	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
CODEOWNERS	Move files for GitHub to .github directory (#5989)	7 years ago
FUNDING.yml	Add GitHub Sponsors	4 years ago
stale.yml	Change stale bot to only touch pull requests over 120 days old (#12217)	5 years ago