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-19 07:38:14 +09:00
2023-02-19 07:38:14 +09:00
2023-02-18 06:56:20 +09:00
2018-06-09 22:46:54 +02:00
2022-04-28 17:47:34 +02:00
2022-08-24 19:00:37 +02:00
2022-01-28 00:46:42 +01:00
2022-04-28 17:47:34 +02:00
2022-02-22 20:14:17 +01:00
2022-01-28 00:46:42 +01:00
2023-02-18 06:56:20 +09:00
2022-02-22 20:14:17 +01:00
2023-02-19 07:38:14 +09:00
2022-04-28 17:47:34 +02:00
2023-02-19 07:38:14 +09:00
2023-02-19 07:38:14 +09:00
2023-02-19 07:38:14 +09:00
2023-02-19 07:38:14 +09:00
2023-02-19 07:10:19 +09:00
2023-02-19 07:38:14 +09:00
2023-02-19 07:38:14 +09:00
2022-04-28 17:47:34 +02:00
2022-03-28 16:22:28 +02:00
2023-02-19 07:38:14 +09:00
2023-02-19 07:10:19 +09:00
2023-02-19 07:38:14 +09:00
2021-12-17 23:01:21 +01:00
2022-03-10 00:11:49 +01:00
2022-01-28 00:46:42 +01:00
2023-02-18 06:56:20 +09:00
2023-02-18 06:56:20 +09:00
2022-09-21 22:46:35 +02:00
2023-02-19 07:38:14 +09:00
2023-02-18 06:56:20 +09:00
2023-02-17 21:46:00 +09:00
2023-01-05 13:47:21 +01:00
2020-09-04 20:22:26 +02:00
2019-08-07 20:20:23 +02:00
2022-01-28 00:46:42 +01:00
2022-01-28 00:46:42 +01:00
2018-05-02 18:58:48 +02:00
2023-01-05 13:47:21 +01:00
2022-01-28 00:46:42 +01:00
2023-02-18 06:56:20 +09:00
2023-01-23 13:05:54 +01:00