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
..
2024-01-16 10:27:26 +00:00
2024-01-16 10:27:26 +00:00
2024-01-16 10:27:26 +00:00
2023-11-07 21:46:08 +00:00
2024-01-16 10:27:26 +00:00
2024-01-16 10:27:26 +00:00
2024-01-16 10:27:26 +00:00
2023-05-23 17:15:17 +02:00
2024-01-16 10:27:26 +00:00
2024-02-24 14:46:14 +01:00
2024-01-25 14:34:26 +00:00
2024-01-16 10:27:26 +00:00
2024-01-16 10:27:26 +00:00
2024-01-12 03:39:11 +00:00
2024-01-16 10:27:26 +00:00
2024-01-16 10:27:26 +00:00
2024-01-16 10:27:26 +00:00
2024-01-16 10:27:26 +00:00
2024-01-16 10:27:26 +00:00
2024-01-16 10:27:26 +00:00
2024-01-16 10:27:26 +00:00
2023-11-09 12:58:02 +00:00
2023-11-09 12:58:02 +00:00
2024-01-25 15:41:31 +00:00
2024-01-16 10:27:26 +00:00
2024-02-19 11:09:58 +00:00
2024-01-16 10:27:26 +00:00
2024-01-16 10:27:26 +00:00
2024-01-16 10:27:26 +00:00
2024-01-16 10:27:26 +00:00
2024-01-16 10:27:26 +00:00
2024-01-16 10:27:26 +00:00
2024-01-16 10:27:26 +00:00
2024-01-16 10:27:26 +00:00
2024-01-16 10:27:26 +00:00
2024-01-16 10:27:26 +00:00
2024-01-16 10:27:26 +00:00
2023-05-23 17:15:17 +02:00
2024-01-16 10:27:26 +00:00
2024-01-16 10:27:26 +00:00
2024-01-16 10:27:26 +00:00
2024-01-25 15:41:31 +00:00
2024-01-24 12:37:43 +00:00
2024-01-16 10:27:26 +00:00
2024-02-02 06:33:53 +00:00
2024-01-16 10:27:26 +00:00