Skip to content

Commit 804ec32

Browse files
committed
Merge branch 'develop' of github.com:NoQuarterTeam/element into develop
# Conflicts: # pnpm-lock.yaml
2 parents 18fc4d2 + 193b096 commit 804ec32

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

apps/app/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
"react": "18.3.1",
5656
"react-dom": "18.3.1",
5757
"react-native": "0.76.7",
58-
"react-native-avoid-softinput": "7.0.0",
58+
"react-native-avoid-softinput": "7.0.1",
5959
"react-native-gesture-handler": "2.20.2",
6060
"react-native-ios-context-menu": "3.1.0",
6161
"react-native-ios-utilities": "5.1.1",

pnpm-lock.yaml

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)