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-02-06 18:47:44 +00:00
2024-01-26 09:15:55 +00:00
2024-02-06 18:47:44 +00:00
2024-02-06 18:47:44 +00:00
2024-02-12 09:59:05 +00:00
2024-02-16 07:51:13 +00:00
2024-01-26 09:15:55 +00:00
2024-02-06 18:47:44 +00:00
2024-01-26 09:15:55 +00:00
2024-02-12 09:59:05 +00:00
2024-01-26 09:15:55 +00:00
2024-01-26 09:15:55 +00:00
2024-02-19 13:25:45 +00:00
2024-02-06 18:47:44 +00:00
2024-02-06 18:47:44 +00:00
2024-02-12 09:59:05 +00:00
2024-02-06 18:47:44 +00:00
2024-02-19 13:25:45 +00:00
2024-02-19 11:09:58 +00:00
2024-02-19 13:25:45 +00:00
2024-02-06 18:47:44 +00:00
2024-02-06 18:47:44 +00:00
2024-02-13 09:08:55 +00:00
2024-02-06 18:47:44 +00:00
2024-02-06 18:47:44 +00:00
2024-02-06 18:47:44 +00:00
2024-02-06 18:47:44 +00:00
2024-02-19 13:25:45 +00:00
2024-02-06 18:47:44 +00:00
2024-02-06 18:47:44 +00:00
2024-02-06 18:47:44 +00:00
2024-02-06 18:47:44 +00:00
2024-02-06 18:47:44 +00:00
2024-02-06 18:47:44 +00:00
2024-02-06 18:47:44 +00:00
2023-10-31 16:05:44 +00:00
2024-02-06 18:47:44 +00:00
2024-02-06 18:47:44 +00:00
2024-02-06 18:47:44 +00:00
2024-02-06 18:47:44 +00:00
2024-01-26 09:15:55 +00:00
2024-02-12 09:59:05 +00:00
2024-02-06 18:47:44 +00:00
2024-02-16 07:51:13 +00:00
2024-01-26 09:15:55 +00:00
2023-10-31 16:05:44 +00:00
2024-02-06 18:47:44 +00:00
2024-02-06 18:47:44 +00:00
2024-02-06 18:47:44 +00:00
2024-02-06 18:47:44 +00:00
2024-01-26 09:15:55 +00:00
2024-02-19 13:25:45 +00:00
2024-01-26 09:15:55 +00:00
2024-01-26 09:15:55 +00:00
2024-02-06 18:47:44 +00:00
2024-01-26 09:15:55 +00:00
2024-01-26 09:15:55 +00:00
2024-01-26 09:15:55 +00:00
2024-02-06 18:47:44 +00:00
2024-02-06 18:47:44 +00:00
2024-02-06 18:47:44 +00:00
2024-01-26 09:15:55 +00:00
2024-01-26 09:15:55 +00:00
2024-01-26 09:15:55 +00:00
2024-02-19 13:25:45 +00:00
2024-02-06 18:47:44 +00:00
2024-01-26 09:15:55 +00:00
2024-02-19 13:25:45 +00:00
2024-02-06 18:47:44 +00:00
2024-02-06 18:47:44 +00:00
2024-02-06 18:47:44 +00:00
2024-02-06 18:47:44 +00:00
2024-02-06 18:47:44 +00:00
2024-02-06 18:47:44 +00:00
2024-02-06 18:47:44 +00:00
2024-02-13 09:08:55 +00:00
2024-02-06 18:47:44 +00:00
2023-12-05 16:07:53 +00:00
2024-01-26 09:15:55 +00:00
2024-01-26 09:15:55 +00:00
2024-01-26 09:15:55 +00:00
2024-02-06 18:47:44 +00:00
2024-02-16 07:51:13 +00:00
2024-02-06 18:47:44 +00:00
2024-02-06 18:47:44 +00:00
2024-02-06 18:47:44 +00:00
2024-02-06 18:47:44 +00:00
2024-02-12 09:59:05 +00:00
2024-01-26 09:15:55 +00:00
2024-01-26 09:15:55 +00:00
2024-01-26 09:15:55 +00:00
2024-01-26 09:15:55 +00:00
2024-02-16 07:51:13 +00:00
2023-12-05 16:07:53 +00:00
2024-02-16 07:51:13 +00:00
2024-02-06 18:47:44 +00:00
2024-01-26 09:15:55 +00:00
2024-01-26 09:15:55 +00:00
2024-02-06 18:47:44 +00:00
2024-01-26 09:15:55 +00:00
2024-01-26 09:15:55 +00:00
2024-02-19 13:25:45 +00:00
2024-01-26 09:15:55 +00:00
2024-02-06 18:47:44 +00:00
2024-02-06 18:47:44 +00:00
2024-02-06 18:47:44 +00:00