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-05 17:33:37 +01:00
2020-11-04 20:45:01 +01:00
2020-01-23 22:00:13 +01:00
2020-03-06 01:29:38 +01:00
2020-08-31 12:47:09 +02:00
2020-09-07 17:47:41 +02:00
2020-12-14 09:06:34 +01:00
2020-09-11 15:16:29 +02:00
2020-05-03 16:30:36 +02:00
2020-09-21 17:48:55 +02:00
2020-11-21 06:18:09 +01:00
2020-11-12 23:44:53 +01:00
2020-10-13 01:01:14 +02:00
2020-02-24 22:21:40 +01:00
2019-07-30 11:10:46 +02:00
2020-09-11 15:16:29 +02:00
2020-08-31 12:47:09 +02:00
2020-08-31 12:47:09 +02:00
2020-03-06 01:29:38 +01:00
2019-08-30 00:14:36 +02:00
2020-03-06 01:29:38 +01:00
2020-09-11 15:16:29 +02:00
2020-08-31 12:47:09 +02:00
2019-09-09 10:50:33 +02:00
2020-03-06 01:29:38 +01:00
2020-09-18 17:26:45 +02:00
2020-03-06 01:29:38 +01:00
2020-09-01 13:31:28 +02:00
2019-09-06 13:55:51 +02:00
2020-06-29 13:56:55 +02:00
2020-10-13 01:01:14 +02:00
2020-09-28 14:13:30 +02:00
2020-05-03 16:30:36 +02:00
2020-03-06 01:29:38 +01:00
2020-04-05 14:40:08 +02:00
2020-08-31 12:47:09 +02:00
2020-07-22 13:38:17 +02:00
2020-03-06 01:29:38 +01:00
2020-03-06 01:29:38 +01:00
2020-03-06 01:29:38 +01:00