Claire
077e0c6812
Merge commit '0b4a3a04378ce43f2f314b9446b5053f6b374c6d' into glitch-soc/merge-upstream ...
Conflicts:
- `Gemfile.lock`:
Conflict caused by the `json` gem thing once again.
Updated as upstream did, but keeping the most recent `json` version.
- `spec/helpers/application_helper_spec.rb`:
Upstream refactored a bunch of specs, including one place that differs
because of glitch-soc's theming system.
Refactored as upstream did, adapting it for glitch-soc's theming system.
2023-12-20 22:16:50 +01:00
2023-11-27 10:06:35 +00:00
2023-12-05 16:07:53 +00:00
2023-11-16 10:08:22 +00:00
2023-11-20 08:47:34 +00:00
2023-11-27 10:06:35 +00:00
2023-11-27 10:06:35 +00:00
2023-11-16 10:08:22 +00:00
2023-11-16 10:08:22 +00:00
2023-09-13 15:10:41 +02:00
2023-12-05 16:07:53 +00:00
2023-11-16 10:08:22 +00:00
2023-11-16 10:08:22 +00:00
2023-11-17 09:16:12 +00:00
2023-11-21 10:35:02 +00:00
2023-11-27 10:06:35 +00:00
2023-11-27 10:06:35 +00:00
2023-11-20 08:47:34 +00:00
2023-11-20 08:47:34 +00:00
2023-11-24 09:27:54 +00:00
2023-11-20 08:47:34 +00:00
2023-11-27 10:06:35 +00:00
2023-12-05 16:07:53 +00:00
2023-11-27 10:06:35 +00:00
2023-11-27 10:06:35 +00:00
2023-11-27 10:06:35 +00:00
2023-12-05 16:07:53 +00:00
2023-11-27 10:06:35 +00:00
2023-12-05 16:07:53 +00:00
2023-11-27 10:06:35 +00:00
2023-11-27 10:06:35 +00:00
2023-11-27 10:06:35 +00:00
2023-11-27 10:06:35 +00:00
2023-11-16 10:08:22 +00:00
2023-11-16 10:08:22 +00:00
2023-11-28 08:59:48 +00:00
2023-10-31 16:05:44 +00:00
2023-11-27 10:06:35 +00:00
2023-11-20 08:47:34 +00:00
2023-11-20 08:47:34 +00:00
2023-12-07 09:38:44 +00:00
2023-11-16 10:08:22 +00:00
2023-11-16 10:08:22 +00:00
2023-11-16 10:08:22 +00:00
2023-06-02 15:00:27 +02:00
2023-10-31 16:05:44 +00:00
2023-11-16 10:08:22 +00:00
2023-11-27 10:06:35 +00:00
2023-11-27 10:06:35 +00:00
2023-11-20 08:47:34 +00:00
2023-11-16 10:08:22 +00:00
2023-11-16 10:08:22 +00:00
2023-11-16 10:08:22 +00:00
2023-09-13 15:10:41 +02:00
2023-12-05 16:07:53 +00:00
2023-11-16 10:08:22 +00:00
2023-11-16 10:08:22 +00:00
2023-09-13 15:10:41 +02:00
2023-07-13 14:22:20 +02:00
2023-12-06 08:52:55 +00:00
2023-11-16 10:08:22 +00:00
2023-09-13 15:10:41 +02:00
2023-11-16 10:08:22 +00:00
2023-11-16 10:08:22 +00:00
2023-11-16 10:08:22 +00:00
2023-11-16 10:08:22 +00:00
2023-12-05 16:07:53 +00:00
2023-11-27 10:06:35 +00:00
2023-11-20 08:47:34 +00:00
2023-11-20 08:47:34 +00:00
2023-11-16 10:08:22 +00:00
2023-11-16 10:08:22 +00:00
2023-11-27 10:06:35 +00:00
2023-11-27 10:06:35 +00:00
2023-11-27 10:06:35 +00:00
2023-11-16 10:08:22 +00:00
2023-11-28 08:59:48 +00:00
2023-12-05 16:07:53 +00:00
2023-11-16 10:08:22 +00:00
2023-12-05 16:07:53 +00:00
2023-11-16 10:08:22 +00:00
2023-11-16 10:08:22 +00:00
2023-12-05 16:07:53 +00:00
2023-11-27 10:06:35 +00:00
2023-12-05 16:07:53 +00:00
2023-11-27 10:06:35 +00:00
2023-11-27 10:06:35 +00:00
2023-11-27 10:06:35 +00:00
2023-09-13 15:10:41 +02:00
2023-11-16 10:08:22 +00:00
2023-09-13 15:10:41 +02:00
2023-11-16 10:08:22 +00:00
2023-12-05 16:07:53 +00:00
2023-12-05 16:07:53 +00:00
2023-11-27 10:06:35 +00:00
2023-11-16 10:08:22 +00:00
2023-09-13 15:10:41 +02:00
2023-11-27 10:06:35 +00:00
2023-09-13 15:10:41 +02:00
2023-11-16 10:08:22 +00:00
2023-11-27 10:06:35 +00:00
2023-11-16 10:08:22 +00:00
2023-11-27 10:06:35 +00:00
2023-11-27 10:06:35 +00:00
2023-12-05 16:07:53 +00:00
077e0c6812