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-30 15:43:26 +00:00
2023-09-13 11:22:53 +02:00
2020-01-23 22:00:13 +01:00
2023-10-18 14:10:07 +02:00
2021-01-10 00:32:01 +01:00
2023-07-02 00:05:44 +02:00
2022-07-17 13:49:29 +02:00
2023-11-20 11:05:28 +00:00
2023-02-18 12:37:47 +01:00
2023-09-05 23:49:48 +02:00
2020-05-03 16:30:36 +02:00
2023-08-21 15:47:09 +02:00
2023-04-30 06:46:39 +02:00
2023-11-23 09:26:11 +00:00
2023-12-19 19:51:40 +01:00
2023-04-29 10:44:56 +02:00
2023-12-01 15:52:56 +00:00
2023-02-19 07:09:40 +09:00
2019-07-30 11:10:46 +02:00
2023-02-18 12:37:47 +01:00
2023-07-12 10:08:51 +02:00
2023-11-13 09:58:28 +00:00
2023-04-28 10:01:38 +02:00
2023-09-08 17:01:02 +02:00
2023-02-18 12:37:47 +01:00
2023-02-18 12:37:47 +01:00
2023-07-12 10:08:51 +02:00
2023-05-23 14:27:37 +02:00
2023-04-30 06:46:39 +02:00
2023-02-18 12:37:47 +01:00
2022-11-17 10:54:10 +01:00
2023-08-02 19:32:48 +02:00
2023-11-13 13:27:00 +00:00
2023-06-05 09:37:02 +02:00
2023-07-12 18:57:40 +02:00
2023-05-05 14:41:07 +02:00
2023-02-18 12:37:47 +01:00
2023-07-13 13:35:15 +02:00
2023-04-25 15:41:34 +02:00
2020-03-06 01:29:38 +01:00
2023-07-10 18:26:56 +02:00
2023-02-18 12:37:47 +01:00
2023-04-29 10:44:56 +02:00
2023-03-26 00:38:32 +01:00
2021-04-24 17:01:43 +02:00
2023-07-17 13:56:28 +02:00