Merge origin/master into feature/message-actions-97-citations-98
Unit Tests / test (pull_request) Failing after 4s
Unit Tests / test (pull_request) Failing after 4s
Resolve package-lock conflict after iOS App (#99) landed on master.
This commit is contained in:
Generated
+10
@@ -12,6 +12,7 @@
|
||||
"@capacitor/app": "^7.1.2",
|
||||
"@capacitor/cli": "^7.6.8",
|
||||
"@capacitor/core": "^7.6.8",
|
||||
"@capacitor/ios": "^7.6.8",
|
||||
"@capacitor/keyboard": "^7.0.6",
|
||||
"@capacitor/preferences": "^7.0.4",
|
||||
"@capacitor/status-bar": "^7.0.6",
|
||||
@@ -2465,6 +2466,15 @@
|
||||
"tslib": "^2.1.0"
|
||||
}
|
||||
},
|
||||
"node_modules/@capacitor/ios": {
|
||||
"version": "7.6.8",
|
||||
"resolved": "https://registry.npmjs.org/@capacitor/ios/-/ios-7.6.8.tgz",
|
||||
"integrity": "sha512-TAM1FdI1Cfl8e/wLBo7x5m61V/J1fMEpyxU2psZzHzsa436k2pwEME6CQoBRYdw6Q6gud0jZSPwOVrNn+MI7Ag==",
|
||||
"license": "MIT",
|
||||
"peerDependencies": {
|
||||
"@capacitor/core": "^7.6.0"
|
||||
}
|
||||
},
|
||||
"node_modules/@capacitor/keyboard": {
|
||||
"version": "7.0.6",
|
||||
"resolved": "https://registry.npmjs.org/@capacitor/keyboard/-/keyboard-7.0.6.tgz",
|
||||
|
||||
Reference in New Issue
Block a user