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-24 14:27:43 +01:00
2023-10-19 16:55:06 +02:00
2023-12-21 11:20:12 +00:00
2023-10-16 15:38:27 +02:00
2023-02-22 09:55:31 +09:00
2024-01-15 17:10:57 +00:00
2024-01-10 11:06:58 +00:00
2023-06-22 11:53:28 +02:00
2024-01-10 11:06:58 +00:00
2024-01-10 11:06:58 +00:00
2024-01-10 11:06:58 +00:00
2023-06-22 14:55:22 +02:00
2023-08-07 17:59:20 +02:00
2024-01-10 11:06:58 +00:00
2023-06-14 16:44:37 +02:00
2024-01-10 11:06:58 +00:00
2024-01-10 11:06:58 +00:00
2024-01-10 11:06:58 +00:00
2023-11-13 09:58:28 +00:00
2023-05-04 05:49:08 +02:00
2023-05-04 05:49:08 +02:00
2024-02-01 15:57:08 +01:00
2024-01-10 11:06:58 +00:00
2024-01-10 11:06:58 +00:00
2024-01-10 11:06:58 +00:00
2024-01-10 11:06:58 +00:00
2024-02-16 07:52:29 +00:00
2023-10-19 16:55:06 +02:00
2023-06-06 15:51:42 +02:00
2024-01-18 10:07:49 +00:00
2024-01-15 13:46:47 +00:00
2024-01-10 11:06:58 +00:00
2024-01-10 11:06:58 +00:00
2024-01-12 15:58:28 +00:00
2024-01-10 11:06:58 +00:00
2024-02-07 14:53:29 +00:00
2024-02-01 15:57:08 +01:00
2023-11-08 15:42:30 +00:00
2023-09-01 17:47:07 +02:00
2024-01-10 11:06:58 +00:00
2023-08-22 09:31:40 +02:00
2024-01-18 10:11:10 +00:00
2023-11-08 15:42:30 +00:00
2024-01-10 11:06:58 +00:00
2024-01-10 11:06:58 +00:00
2024-01-10 11:06:58 +00:00
2024-01-10 11:06:58 +00:00
2024-01-10 11:06:58 +00:00
2024-02-22 20:45:40 +01:00