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
..
2019-11-13 23:02:10 +01:00
2017-07-08 00:06:02 +02:00
2018-06-29 15:34:36 +02:00
2017-09-13 10:24:33 +02:00
2019-11-13 23:02:10 +01:00
2018-02-28 06:54:55 +01:00
2018-04-17 15:23:46 +02:00
2018-03-24 13:06:27 +01:00