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-12-09 14:42:33 +01:00
2020-12-15 12:56:43 +01:00
2020-12-07 19:36:36 +01:00
2020-12-15 14:27:06 +01:00
2020-12-05 17:33:37 +01:00
2020-03-28 17:59:45 +01:00
2020-11-16 05:16:39 +01:00
2020-12-07 19:36:36 +01:00
2020-03-08 16:02:36 +01:00
2020-03-08 16:02:36 +01:00
2020-11-23 17:35:14 +01:00
2019-03-26 11:13:20 +01:00
2020-02-18 17:22:44 +01:00
2020-12-07 04:29:37 +01:00
2020-03-21 03:14:50 +01:00
2019-07-16 16:11:50 +02:00
2019-12-19 07:39:08 +09:00
2020-10-21 19:10:50 +02:00
2020-11-16 05:16:39 +01:00
2019-11-04 13:03:09 +01:00
2020-02-18 17:22:44 +01:00
2020-10-13 00:37:21 +02:00
2019-06-29 18:32:06 +02:00
2020-11-23 17:35:14 +01:00
2020-06-29 13:58:07 +02:00