Merge branch 'dev' of github.com:laurent22/joplin into dev

laurent22 · Aug 12, 2021 · 11cf847 · 11cf847
2 parents 77a8ab8 + 3309f42
commit 11cf847
Show file tree

Hide file tree

Showing 14 changed files with 141,817 additions and 60,296 deletions.
diff --git a/packages/app-cli/package-lock.json b/packages/app-cli/package-lock.json
diff --git a/packages/app-desktop/package-lock.json b/packages/app-desktop/package-lock.json
diff --git a/packages/app-desktop/package.json b/packages/app-desktop/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@joplin/app-desktop",
-  "version": "2.3.0",
+  "version": "2.3.2",
   "description": "Joplin for Desktop",
   "main": "main.js",
   "private": true,

diff --git a/packages/app-mobile/package-lock.json b/packages/app-mobile/package-lock.json
diff --git a/packages/fork-htmlparser2/package-lock.json b/packages/fork-htmlparser2/package-lock.json