Skip to content

Commit ca33f49

Browse files
Merge pull request #208 from DefGuard/merger-pre-1.6
Merge main into dev before 1.6 release
2 parents cd25c36 + c6ddfd4 commit ca33f49

File tree

22 files changed

+2384
-1019
lines changed

22 files changed

+2384
-1019
lines changed

.github/workflows/release.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,8 @@ jobs:
114114
- name: Install pnpm
115115
uses: pnpm/action-setup@v4
116116
with:
117-
version: 10
117+
# FIXME: temporarily pinned because of https://github.com/pnpm/pnpm/pull/9959
118+
version: 10.17
118119

119120
- name: Use Node.js
120121
uses: actions/setup-node@v4

Cargo.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "defguard-proxy"
3-
version = "1.5.1"
3+
version = "1.6.0"
44
edition = "2021"
55
license = "Apache-2.0"
66
homepage = "https://github.com/DefGuard/proxy"

package.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"devDependencies": {
3+
"@tanstack/devtools-vite": "^0.3.11"
4+
}
5+
}

0 commit comments

Comments
 (0)