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-03-12 17:57:59 +01:00
2018-05-05 23:06:29 +02:00
2018-12-22 20:02:09 +01:00
2020-12-15 06:28:14 +01:00
2020-11-06 11:56:31 +01:00
2020-01-28 02:21:00 +01:00
2019-02-05 15:11:35 +01:00
2020-11-06 11:56:31 +01:00
2019-09-30 12:23:57 +02:00
2020-11-06 11:56:31 +01:00
2020-11-06 11:56:31 +01:00
2020-03-12 22:35:20 +01:00
2020-12-14 09:06:34 +01:00
2019-03-15 05:35:17 +01:00
2020-11-06 11:56:31 +01:00
2020-11-06 11:56:31 +01:00
2020-04-28 19:39:16 +02:00
2018-08-28 05:39:43 +02:00
2018-04-20 02:28:48 +02:00
2020-12-15 14:27:06 +01:00
2020-12-15 14:27:06 +01:00
2020-11-06 11:56:31 +01:00
2020-11-06 11:56:31 +01:00
2020-03-12 17:57:59 +01:00