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": "487f6073-3300-4819-a07d-39652e45fb4d",
"key": "3d74d616-2502-4c17-9cc3-92c366550f4f",