Claire 93912f0498 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/models/account.rb`:
  Conflict because we (glitch-soc) have disabled trending of posts without
  review.
  Discarded that upstream change.
- `app/views/admin/settings/discovery/show.html.haml`:
  Just an extra setting in glitch-soc.
  Kept that extra setting.
2022-11-12 13:28:03 +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
2021-02-21 19:50:12 +01:00
2020-06-02 19:24:53 +02:00