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
..
2023-12-20 22:25:23 +01:00
2023-07-12 09:47:08 +02:00
2024-01-03 10:23:58 +00:00
2023-08-02 19:32:48 +02:00
2023-12-18 09:32:02 +00:00
2023-07-12 09:47:08 +02:00
2023-07-12 09:47:08 +02:00
2023-07-12 09:47:08 +02:00
2020-06-27 20:20:11 +02:00
2023-08-18 08:18:40 +02:00
2023-07-12 09:47:08 +02:00
2024-02-12 09:54:06 +00:00
2024-01-17 09:22:16 +00:00
2023-12-12 12:01:08 +00:00
2023-07-12 09:47:08 +02:00
2023-10-25 13:56:09 +00:00
2024-01-17 09:08:17 +00:00
2024-02-13 20:03:00 +01:00
2023-07-12 09:47:08 +02:00
2023-07-12 09:47:08 +02:00
2023-10-25 13:56:09 +00:00
2023-07-12 09:47:08 +02:00
2023-07-12 09:47:08 +02:00
2024-01-09 10:56:13 +00:00
2023-11-30 13:55:20 +00:00
2023-10-31 15:21:23 +00:00
2023-10-31 15:21:23 +00:00
2020-04-03 13:06:34 +02:00
2022-10-19 22:08:10 +02:00
2023-07-12 09:47:08 +02:00
2023-09-04 09:46:33 +02:00
2024-01-09 12:50:57 +00:00
2023-07-12 09:47:08 +02:00
2024-01-08 10:17:38 +00:00
2023-07-12 09:47:08 +02:00
2023-11-09 09:43:26 +00:00
2023-10-25 13:56:09 +00:00
2023-07-12 09:47:08 +02:00
2023-07-12 09:47:08 +02:00
2024-01-15 18:18:59 +00:00
2023-07-12 09:47:08 +02:00
2023-10-03 15:24:12 +02:00
2023-07-12 09:47:08 +02:00
2017-06-23 18:50:53 +02:00
2023-09-28 15:48:47 +02:00
2024-02-06 21:00:09 +01:00
2023-12-21 19:24:10 +01:00
2016-12-06 17:19:26 +01:00
2023-08-03 20:28:14 +02:00
2023-07-12 09:47:08 +02:00
2023-10-26 20:35:15 +00:00
2021-04-09 02:31:20 +02:00
2023-12-15 14:33:56 +00:00
2023-07-28 23:11:45 +02:00
2018-10-04 12:36:53 +02:00
2023-07-12 09:47:08 +02:00
2023-07-12 09:47:08 +02:00