Claire
7452a95998
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/dependabot.yml`:
Upstream made changes while we have dropped this file.
Keep the file deleted.
- `.prettierignore`:
Upstream made changes at the end of the file, where we
had our extra lines.
Just moved our extra lines back at the end.
- `app/serializers/initial_state_serializer.rb`:
Upstream code style changes.
Applied them.
- `app/services/backup_service.rb`:
Upstream code style changes.
Applied them.
2023-02-19 10:42:55 +01:00
..
2023-02-18 06:56:20 +09:00
2022-07-05 02:41:40 +02:00
2023-02-19 10:42:55 +01:00
2023-02-18 06:56:20 +09:00
2023-02-19 07:38:14 +09:00
2023-02-18 06:56:20 +09:00
2018-10-07 23:44:58 +02:00
2020-09-15 14:37:58 +02:00
2021-12-05 21:48:39 +01:00
2022-12-07 02:35:39 +01:00
2018-10-04 12:36:53 +02:00
2023-02-19 07:38:14 +09:00
2023-02-19 07:10:19 +09:00
2022-03-08 09:14:39 +01:00
2020-01-23 22:00:13 +01:00
2020-01-23 22:00:13 +01:00
2020-01-23 22:00:13 +01:00
2022-02-14 21:27:53 +01:00
2018-10-04 12:36:53 +02:00
2021-04-17 03:14:25 +02:00
2018-10-04 12:36:53 +02:00
2019-07-28 17:47:37 +02:00
2019-06-28 15:54:10 +02:00
2023-02-18 03:24:16 +01:00
2023-02-18 03:26:20 +01:00
2022-06-28 09:42:13 +02:00
2018-10-04 12:36:53 +02:00
2023-02-18 06:56:20 +09:00
2019-07-30 11:10:46 +02:00
2020-01-08 22:42:05 +01:00
2022-08-24 19:00:55 +02:00
2023-02-18 06:56:20 +09:00
2023-02-18 06:56:20 +09:00
2019-02-04 04:25:59 +01:00
2021-04-12 12:37:14 +02:00
2022-10-02 18:46:22 +02:00
2020-12-18 09:18:31 +01:00
2022-04-28 17:47:34 +02:00
2018-12-06 17:38:49 +09:00
2023-02-18 04:00:05 +01:00
2020-09-15 14:37:58 +02:00
2020-10-12 16:33:49 +02:00
2018-10-04 12:36:53 +02:00
2018-10-04 12:36:53 +02:00
2023-02-18 06:56:20 +09:00
2019-09-06 13:55:51 +02:00
2023-02-19 07:38:14 +09:00
2018-10-04 12:36:53 +02:00
2021-01-31 21:24:57 +01:00
2023-02-18 06:56:20 +09:00
2019-03-03 22:18:23 +01:00
2019-07-27 10:24:26 +02:00
2018-10-04 12:36:53 +02:00
2022-10-08 16:45:40 +02:00
2022-01-28 08:58:32 +01:00
2020-05-08 20:17:16 +02:00
2018-07-13 02:16:06 +02:00
2019-08-30 02:19:17 +02:00
2022-03-09 09:06:17 +01:00
2021-02-21 19:50:12 +01:00
2019-01-05 12:43:28 +01:00
2023-02-18 03:24:16 +01:00
2023-02-18 03:24:16 +01:00
2022-01-19 22:37:27 +01:00
2022-01-17 00:49:55 +01:00
2022-10-28 19:23:58 +02:00
2018-11-19 00:43:52 +01:00
2022-10-08 16:45:40 +02:00
2023-02-18 06:56:20 +09:00
2021-07-08 16:17:19 +02:00
2022-07-17 13:49:29 +02:00
2023-01-04 02:12:48 +01:00
2020-04-15 20:33:24 +02:00
2019-04-09 23:06:30 +09:00
2023-02-18 03:24:16 +01:00
2023-02-19 07:17:59 +09:00
2023-02-19 07:38:14 +09:00
2022-06-09 21:57:36 +02:00