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-04 20:45:01 +01:00
2020-10-21 19:10:50 +02:00
2020-09-15 14:37:58 +02:00
2020-12-14 09:06:34 +01:00
2020-01-23 22:00:13 +01:00
2020-01-23 22:00:13 +01:00
2020-01-23 22:00:13 +01:00
2019-06-28 15:54:10 +02:00
2018-12-11 05:30:57 +01:00
2020-06-02 19:24:53 +02:00
2020-06-02 19:24:53 +02:00
2020-09-28 14:13:30 +02:00
2017-09-02 20:45:42 +02:00
2020-09-15 14:37:58 +02:00
2020-10-12 16:33:49 +02:00
2020-01-23 21:40:03 +01:00
2020-06-02 19:24:53 +02:00
2018-10-04 12:36:53 +02:00
2020-09-08 16:26:47 +02:00
2020-05-08 20:17:16 +02:00
2018-07-13 02:16:06 +02:00
2020-09-08 16:26:47 +02:00
2020-06-02 19:24:53 +02:00
2020-09-08 16:26:47 +02:00
2020-04-15 20:33:24 +02:00
2019-04-09 23:06:30 +09:00
2020-08-24 16:46:27 +02:00
2020-09-16 20:16:46 +02:00