Merge remote-tracking branch 'remotes/origin/dev' into feature/new-gui

This commit is contained in:
vladimir.kuznetsov
2023-06-27 13:38:06 +03:00
179 changed files with 3824 additions and 4107 deletions
+2
View File
@@ -155,6 +155,7 @@ bool ContainerProps::isSupportedByCurrentPlatform(DockerContainer c)
switch (c) {
case DockerContainer::WireGuard: return true;
case DockerContainer::OpenVpn: return true;
case DockerContainer::Cloak: return true;
// case DockerContainer::ShadowSocks: return true;
default: return false;
}
@@ -170,6 +171,7 @@ bool ContainerProps::isSupportedByCurrentPlatform(DockerContainer c)
case DockerContainer::WireGuard: return true;
case DockerContainer::OpenVpn: return true;
case DockerContainer::ShadowSocks: return true;
case DockerContainer::Cloak: return true;
default: return false;
}