Claire ef3d15554b Merge commit 'c645490d553124d800d30488595f7d2d9d61584d' into glitch-soc/merge-upstream
Conflicts:
- `Gemfile.lock`:
  Changes were already cherry-picked and updated further in glitch-soc.
  Kept glitch-soc's version.
- `README.md`:
  Upstream updated its README, we have a completely different one.
  Kept glitch-soc's README.
- `app/models/account.rb`:
  Not a real conflict, upstream updated some lines textually adjacent
  to glitch-soc-specific lines.
  Ported upstream's changes.
2024-02-24 14:46:14 +01:00
..
2021-04-22 00:04:58 +02:00
2022-11-17 21:59:15 +09:00
2022-11-01 18:42:04 +09:00
2021-04-22 00:04:58 +02:00
2022-12-16 12:46:39 +09:00
2020-11-09 00:56:52 +01:00
2020-07-10 20:57:21 +02:00
2023-02-01 19:59:31 +09:00
2020-11-10 16:53:54 +09:00
2022-11-17 21:59:15 +09:00
2023-02-22 21:16:02 +09:00
2023-01-19 02:31:13 +09:00
2020-11-09 00:56:52 +01:00
2022-11-01 18:42:04 +09:00
2023-01-19 02:31:13 +09:00
2021-04-22 00:04:58 +02:00
2022-12-16 12:46:39 +09:00
2022-03-11 14:35:51 +09:00
2020-11-09 00:56:52 +01:00
2022-03-11 14:35:51 +09:00
2020-07-10 20:57:21 +02:00
2023-02-01 19:59:31 +09:00