Merge branch 'release-2.1' into dev

packages/app-cli/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "joplin",
-  "version": "2.1.1",
+  "version": "2.1.2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

packages/app-cli/package.json

@@ -32,7 +32,7 @@
     ],
     "owner": "Laurent Cozic"
   },
-  "version": "2.1.1",
+  "version": "2.1.2",
   "bin": {
     "joplin": "./main.js"
   },
@@ -40,8 +40,8 @@
     "node": ">=10.0.0"
   },
   "dependencies": {
-    "@joplin/lib": "2.0",
-    "@joplin/renderer": "2.0",
+    "@joplin/lib": "2.1",
+    "@joplin/renderer": "2.1",
     "aws-sdk": "^2.588.0",
     "chalk": "^4.1.0",
     "compare-version": "^0.1.2",
@@ -65,7 +65,7 @@
     "yargs-parser": "^7.0.0"
   },
   "devDependencies": {
-    "@joplin/tools": "2.0",
+    "@joplin/tools": "2.1",
     "@types/fs-extra": "^9.0.6",
     "@types/jest": "^26.0.15",
     "@types/node": "^14.14.6",

readme/changelog_cli.md

@@ -1,6 +1,6 @@
 # Joplin terminal app changelog
 
-## [cli-v2.1.1](https://github.com/laurent22/joplin/releases/tag/cli-v2.1.1) - 2021-06-27T14:08:02Z
+## [cli-v2.1.2](https://github.com/laurent22/joplin/releases/tag/cli-v2.1.2) - 2021-06-27T15:51:36Z
 
 - New: Add support for X-API-MIN-VERSION header (51f3c00)
 - New: Added flag to disable local lock when synchronising (7aff6d2)