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-07 23:37:58 +00:00
2023-10-24 17:45:08 +00:00
2023-11-28 18:20:10 +00:00
2023-10-26 11:00:10 +00:00
2023-11-07 21:46:08 +00:00
2023-11-07 23:37:58 +00:00
2023-10-27 13:21:07 +00:00
2023-10-24 17:45:08 +00:00
2023-05-23 17:15:17 +02:00
2023-10-24 17:45:08 +00:00
2023-12-19 21:24:01 +01:00
2023-10-24 17:45:08 +00:00
2023-11-03 15:00:03 +00:00
2023-10-27 13:21:07 +00:00
2023-10-24 08:06:14 +00:00
2023-10-24 17:45:08 +00:00
2023-10-24 17:45:08 +00:00
2023-10-24 17:45:08 +00:00
2023-10-24 17:45:08 +00:00
2023-10-24 17:45:08 +00:00
2023-11-03 15:00:03 +00:00
2023-11-28 18:20:10 +00:00
2023-11-09 12:58:02 +00:00
2023-11-09 12:58:02 +00:00
2023-10-24 17:45:08 +00:00
2023-10-24 17:45:08 +00:00
2023-10-24 17:45:08 +00:00
2023-12-06 13:42:12 +00:00
2023-10-24 17:45:08 +00:00
2023-11-03 15:00:03 +00:00
2023-11-03 15:00:03 +00:00
2023-11-14 00:39:54 +00:00
2023-10-24 17:45:08 +00:00
2023-10-27 13:21:07 +00:00
2023-11-03 15:00:03 +00:00
2023-11-17 10:37:04 +00:00
2023-11-15 09:29:10 +00:00
2023-10-27 13:21:07 +00:00
2023-05-23 17:15:17 +02:00
2023-10-24 17:45:08 +00:00
2023-10-24 17:45:08 +00:00
2023-11-03 15:00:03 +00:00
2023-05-23 17:15:17 +02:00
2023-11-13 14:39:45 +00:00
2023-10-24 17:45:08 +00:00
2023-12-06 13:42:12 +00:00
2023-12-06 13:42:12 +00:00