Thibaut Girka 7b435fd9bf Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `app/services/post_status_service.rb`:
  CW/sensitive logic fixed upstream, but different in glitch-soc.
  Ported the changes accordingly.
2020-03-27 21:54:44 +01:00
..
2019-07-30 11:10:46 +02:00
2018-10-07 23:44:58 +02:00
2017-03-02 18:49:32 +01:00