Claire
392ca0472a
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/packs/admin.js`:
Conflicts due to glitch-soc's theming system.
Upstream changes have been ported to `app/javascript/core/admin.js`
- `app/models/trends/statuses.rb`:
Minor conflict due to glitch-soc's option to allow CWed toots in trends.
Ported upstream changes.
2022-05-01 16:52:27 +02:00
..
2022-04-08 19:53:32 +02:00
2022-04-29 00:24:31 +02:00
2022-03-06 22:51:40 +01:00
2022-05-01 16:52:27 +02:00
2022-05-01 16:52:27 +02:00
2020-03-28 17:59:45 +01:00
2022-04-07 16:08:17 +02:00
2020-12-07 19:36:36 +01:00
2022-02-23 16:45:22 +01:00
2018-05-19 19:22:11 +02:00
2020-03-08 16:02:36 +01:00
2021-10-14 20:44:59 +02:00
2021-09-26 05:46:13 +02: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
2021-06-30 00:42:52 +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
2017-09-30 04:29:56 +02:00
2017-07-14 11:08:56 +02:00
2019-06-29 18:32:06 +02:00
2018-03-04 20:27:25 +01:00
2020-11-23 17:35:14 +01:00
2020-06-29 13:58:07 +02:00
2017-05-03 02:04:16 +02:00