Merge branch (resolved)

2026-09-19 14:00:21 +07:00
parent f2ef54420e c8579571e9
commit 2bc9aa14d8
47 changed files with 92 additions and 583 deletions
--- a/backups/conflicts/ca4e5705-9e6d-400b-a196-a2551e5bfe27_conflict_1789801207.json
+++ b/backups/conflicts/ca4e5705-9e6d-400b-a196-a2551e5bfe27_conflict_1789801207.json
@@ -0,0 +1,18 @@
+{
+  "id": "ca4e5705-9e6d-400b-a196-a2551e5bfe27",
+  "name": "Docker Password Host",
+  "hostname": "127.0.0.1",
+  "port": 2222,
+  "username": "testuser",
+  "identity_id": null,
+  "group_id": null,
+  "tags": [],
+  "jump_host_id": null,
+  "keepalive_interval": 1,
+  "keepalive_count_max": null,
+  "legacy_algorithms": null,
+  "ssh_config_overrides": null,
+  "notes": null,
+  "created_at": "2026-08-14T05:27:50.361854+00:00",
+  "updated_at": "2026-08-14T05:27:50.361854+00:00"
+}