Skip to content

Commit 4852a07

Browse files
committed
Merge branch 'develop' of github.com:NoQuarterTeam/element into develop
# Conflicts: # pnpm-lock.yaml
2 parents b2fd61f + caf8722 commit 4852a07

File tree

4 files changed

+892
-906
lines changed

4 files changed

+892
-906
lines changed

apps/app/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,8 @@
7373
"zustand": "4.5.6"
7474
},
7575
"devDependencies": {
76-
"@babel/core": "7.26.7",
77-
"@babel/preset-env": "7.26.7",
76+
"@babel/core": "7.26.8",
77+
"@babel/preset-env": "7.26.8",
7878
"@babel/runtime": "7.26.7",
7979
"@element/tailwind-config": "*",
8080
"@expo/config-plugins": "7.8.4",

apps/web/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
"js-cookie": "3.0.5",
5454
"jsonwebtoken": "9.0.2",
5555
"limax": "4.1.0",
56-
"lucide-react": "0.474.0",
56+
"lucide-react": "0.475.0",
5757
"match-sorter": "6.3.4",
5858
"polished": "4.3.1",
5959
"posthog-js": "^1.100.0",

packages/server/services/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
"typecheck": "tsc --noEmit"
1010
},
1111
"dependencies": {
12-
"@aws-sdk/client-s3": "3.743.0",
13-
"@aws-sdk/lib-storage": "3.743.0",
14-
"@aws-sdk/s3-request-presigner": "3.743.0",
12+
"@aws-sdk/client-s3": "3.744.0",
13+
"@aws-sdk/lib-storage": "3.744.0",
14+
"@aws-sdk/s3-request-presigner": "3.744.0",
1515
"@element/database": "workspace:*",
1616
"@element/emails": "workspace:*",
1717
"@element/server-env": "workspace:*",

0 commit comments

Comments
 (0)