Claire 6c20dad201 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `README.md`:
  Upstream updated its README, while we have a completely different one.
  Kept our README.
- `app/controllers/concerns/web_app_controller_concern.rb`:
  Conflict because of glitch-soc's theming system.
  Additionally, glitch-soc has different behavior regarding moved accounts.
  Ported some of the changes, but kept our overall behavior.
- `app/javascript/packs/admin.js`:
  Code changes actually applied to `app/javascript/core/admin.js`
2023-01-05 14:16:25 +01:00
..
2017-11-24 02:05:53 +01:00
2020-01-23 22:00:13 +01:00
2020-06-02 19:24:53 +02:00
2020-06-02 19:24:53 +02:00
2022-05-25 12:27:11 +02:00
2020-06-02 19:24:53 +02:00
2020-06-02 19:24:53 +02:00
2017-01-13 03:24:41 +01:00