Merge pull request #105 from DefGuard/dev

Merge dev -> main
DefGuard · Jan 17, 2025 · d877f83 · d877f83
2 parents 75be316 + 661cd95
commit d877f83
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "defguard-proxy"
-version = "1.1.2"
+version = "1.2.0"
 edition = "2021"
 license = "Apache-2.0"
 homepage = "https://github.com/DefGuard/proxy"

diff --git a/proto b/proto
+0 −40		build.sh
+1 −1		core/proxy.proto
+0 −88		core/vpn.proto
+2 −1		wireguard/gateway.proto