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-10-24 20:23:46 +02:00
2023-07-12 09:47:08 +02:00
2021-05-17 22:36:08 +02:00
2023-08-02 19:32:48 +02:00
2023-10-19 16:55:06 +02: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
2023-10-13 19:00:53 +02:00
2023-12-19 21:14:39 +01:00
2023-07-21 13:17:43 +02:00
2023-07-12 09:47:08 +02:00
2023-10-25 13:56:09 +00:00
2023-10-31 11:10:15 +00:00
2023-11-09 09:43:26 +00: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
2023-11-07 15:22:14 +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
2023-07-13 09:36:07 +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
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
2023-11-29 10:08:55 +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
2023-11-09 16:19:04 +00:00
2023-12-18 18:34:25 +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-07-12 09:47:08 +02: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