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
..
2019-09-29 21:31:51 +02:00
2022-03-26 02:53:34 +01:00
2022-03-26 02:53:34 +01:00
2020-10-12 16:33:49 +02:00
2020-06-02 19:24:53 +02:00
2022-03-26 02:53:34 +01:00
2022-01-16 22:26:18 +01:00