Resolve conflicts

This commit is contained in:
Shtorm
2026-02-26 22:57:25 +03:00
130 changed files with 13487 additions and 285 deletions

View File

@@ -12,7 +12,7 @@
},
"endpoints": [
{
"type": "tunnel_client",
"type": "tunnel-client",
"tag": "tunnel",
"uuid": "9b65b7e1-04c8-4717-8f45-2aa61fd25937",
"key": "1c9b2ccf-b0c0-4c26-868d-a55a4edad3fe",

View File

@@ -12,7 +12,7 @@
},
"endpoints": [
{
"type": "tunnel_client",
"type": "tunnel-client",
"tag": "tunnel",
"uuid": "487f6073-3300-4819-a07d-39652e45fb4d",
"key": "3d74d616-2502-4c17-9cc3-92c366550f4f",

View File

@@ -12,7 +12,7 @@
},
"endpoints": [
{
"type": "tunnel_server",
"type": "tunnel-server",
"tag": "tunnel",
"uuid": "f79f7678-55e7-432d-a15f-6e8ab2b7fe13",
"users": [