Thibaut Girka 9adeaf2bfc Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `app/controllers/statuses_controller.rb`:
  Minor conflict due to theming system
2020-01-24 14:37:06 +01:00
..
2019-11-13 23:02:10 +01:00
2020-01-23 22:00:13 +01:00
2019-04-27 03:24:09 +02:00
2020-01-23 22:00:13 +01:00