Claire be493b6c0d Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/models/account.rb`:
  Not a real conflict, just upstream getting rid of unused constants too close
  to glitch-soc-specific contents.
  Removed unused constants like upstream did.
- `app/models/trends.rb`:
  Conflict because glitch-soc disabled email notifications for trending links.
  Upstream has refactored this quite a bit and added trending posts.
  Took upstream code, but disabling the extra trending stuff will come in
  another commit.
- `app/views/admin/trends/links/index.html.haml`:
  Conflict due to glitch-soc's theming system.
  Ported upstream changes accordingly.
2022-02-26 09:29:23 +01:00
..
2022-01-28 00:46:42 +01:00
2022-02-25 00:34:14 +01:00
2022-02-22 20:14:17 +01:00
2022-02-14 21:27:53 +01:00
2018-10-04 12:36:53 +02:00
2017-06-19 11:31:37 +02:00
2018-10-04 12:36:53 +02:00
2018-10-04 12:36:53 +02:00
2020-06-02 19:24:53 +02:00
2017-06-19 01:38:50 +02:00
2020-10-12 16:33:49 +02:00
2018-10-04 12:36:53 +02:00
2018-10-04 12:36:53 +02:00
2017-04-05 00:29:56 +02:00
2018-10-04 12:36:53 +02:00
2020-06-02 19:24:53 +02:00
2019-03-03 22:18:23 +01:00
2018-10-04 12:36:53 +02:00
2021-02-21 19:50:12 +01:00
2020-06-02 19:24:53 +02:00
2021-04-25 06:33:28 +02:00