Resolve conflicts

This commit is contained in:
Sergei Maklagin
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_server",
"type": "tunnel-server",
"tag": "tunnel",
"uuid": "f79f7678-55e7-432d-a15f-6e8ab2b7fe13",
"users": [