Claire e4f8679eae Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `app/models/form/admin_settings.rb`:
  New setting added upstream. Ported it.
- `app/views/statuses/_simple_status.html.haml`:
  Upstream removed RTL classes. Did the same.
- `config/settings.yml`:
  New setting added upstream. Ported it.
2020-12-15 14:27:06 +01:00
..
2020-11-23 17:35:14 +01:00
2019-12-19 07:39:08 +09:00
2017-11-17 19:29:16 -08:00
2017-11-17 19:29:16 -08:00
2020-11-23 17:35:14 +01:00
2017-11-17 19:29:16 -08:00