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:46:14 +01:00
2023-09-01 17:47:07 +02:00
2023-05-03 10:32:30 +02:00
2023-08-24 16:40:04 +02:00
2024-01-26 16:35:19 +00:00
2023-06-06 13:58:33 +02:00
2023-12-17 23:04:16 +01:00
2023-11-08 14:43:17 +00:00
2023-12-21 11:19:56 +00:00
2023-06-06 10:42:47 +02:00
2023-07-20 18:23:48 +02:00
2023-11-07 15:47:01 +00:00
2023-05-08 19:28:43 +02:00
2023-10-23 17:58:29 +00:00
2024-01-05 10:45:36 +00:00
2022-04-28 17:47:34 +02:00
2023-05-04 05:49:08 +02:00
2023-06-06 13:58:33 +02:00
2023-06-06 13:58:33 +02:00
2023-02-18 06:56:20 +09:00
2023-12-17 23:04:16 +01:00
2022-07-13 15:03:28 +02:00
2023-05-04 05:49:08 +02:00
2024-01-26 16:31:07 +00:00
2022-10-20 14:35:29 +02:00
2023-03-08 19:56:41 +01:00
2024-02-07 14:53:29 +00:00
2023-11-14 14:52:59 +00:00
2023-05-04 05:49:08 +02:00
2023-09-01 09:43:12 +02:00
2023-09-08 14:25:00 +02:00
2024-02-07 17:24:42 +00:00
2023-05-04 05:49:08 +02:00
2023-11-14 14:52:59 +00:00
2023-07-12 10:20:10 +02:00
2023-06-06 15:51:42 +02:00
2023-06-22 14:55:22 +02:00
2023-06-06 13:58:33 +02:00
2023-05-04 05:49:08 +02:00
2023-11-07 09:46:28 +00:00