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.		2020-11-20 13:27:48 +01:00
..
assets	…
chewy/strategy	…
devise	…
generators	…
json_ld	…
mastodon	Merge branch 'master' into glitch-soc/merge-upstream	2020-11-20 13:27:48 +01:00
paperclip	…
redis	…
tasks	Merge branch 'master' into glitch-soc/merge-upstream	2020-11-20 13:27:48 +01:00
templates	…
webpacker	…
cli.rb	Deal with collation-related index corruption (#14860)	2020-11-19 17:37:49 +01:00