Skip to content

Commit

Permalink
Merge branch 'dev' into plugin_editor
Browse files Browse the repository at this point in the history
  • Loading branch information
laurent22 authored Nov 9, 2024
2 parents 763b9de + de83b42 commit 803ed7d
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/cla.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
path-to-signatures: 'readme/cla_signatures.json'
path-to-document: 'https://github.com/laurent22/joplin/blob/dev/readme/cla.md' # e.g. a CLA or a DCO document
# branch should not be protected
branch: 'dev'
branch: 'cla_signatures'
allowlist: joplinbot,renovate[bot]

# the followings are the optional inputs - If the optional inputs are not given, then default values will be taken
Expand Down
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
"url": "git+https://github.com/laurent22/joplin.git"
},
"engines": {
"node": ">=18"
"node": ">=18",
"yarn": "3.8.3"
},
"scripts": {
"buildApiDoc": "yarn workspace joplin start apidoc ../../readme/api/references/rest_api.md",
Expand Down
2 changes: 1 addition & 1 deletion packages/app-mobile/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"@joplin/utils": "~3.2",
"@react-native-clipboard/clipboard": "1.14.1",
"@react-native-community/datetimepicker": "8.2.0",
"@react-native-community/geolocation": "3.2.1",
"@react-native-community/geolocation": "3.3.0",
"@react-native-community/netinfo": "11.3.2",
"@react-native-community/push-notification-ios": "1.11.0",
"@react-native-community/slider": "4.5.2",
Expand Down
10 changes: 5 additions & 5 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -8267,7 +8267,7 @@ __metadata:
"@js-draw/material-icons": 1.20.3
"@react-native-clipboard/clipboard": 1.14.1
"@react-native-community/datetimepicker": 8.2.0
"@react-native-community/geolocation": 3.2.1
"@react-native-community/geolocation": 3.3.0
"@react-native-community/netinfo": 11.3.2
"@react-native-community/push-notification-ios": 1.11.0
"@react-native-community/slider": 4.5.2
Expand Down Expand Up @@ -11032,13 +11032,13 @@ __metadata:
languageName: node
linkType: hard

"@react-native-community/geolocation@npm:3.2.1":
version: 3.2.1
resolution: "@react-native-community/geolocation@npm:3.2.1"
"@react-native-community/geolocation@npm:3.3.0":
version: 3.3.0
resolution: "@react-native-community/geolocation@npm:3.3.0"
peerDependencies:
react: "*"
react-native: "*"
checksum: 9d2749a9a86697f1b0da7ebf873d444efbf926eedee89a35810016385b81005d4802cbd7d1188ebfdfb146a41d5a11b8c907ee3ce8b434a4929fd81cac100f75
checksum: a0920ff7ff2f9f24300a8eabd641fd5bd9124a8a5274f0077d64bc143111c925986eaf7c29fa25b6b0daaebb780ebf1aeee12e908584fe200fc619e30de330c6
languageName: node
linkType: hard

Expand Down

0 comments on commit 803ed7d

Please sign in to comment.