From 469cd19ec134927c1cdf72b9fa3d026094868dd1 Mon Sep 17 00:00:00 2001
From: Laurent Cozic <laurent@cozic.net>
Date: Mon, 28 Dec 2020 14:29:02 +0000
Subject: [PATCH 1/2] Desktop: Fix issue when importing ENEX file that contains
 invalid list elements

---
 packages/lib/import-enex-md-gen.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/lib/import-enex-md-gen.js b/packages/lib/import-enex-md-gen.js
index b7346fb4a..723430de1 100644
--- a/packages/lib/import-enex-md-gen.js
+++ b/packages/lib/import-enex-md-gen.js
@@ -624,7 +624,7 @@ function enexXmlToMdArray(stream, resources) {
 				section.lines.push(BLOCK_OPEN);
 				if (!state.lists.length) {
 					displaySaxWarning(this, 'Found <li> tag without being inside a list');
-					// return;
+					return;
 				}
 
 				const container = state.lists[state.lists.length - 1];

From 66a5490b54d50dc821592d5e05983f6225c907df Mon Sep 17 00:00:00 2001
From: Laurent Cozic <laurent@cozic.net>
Date: Mon, 28 Dec 2020 14:29:37 +0000
Subject: [PATCH 2/2] Desktop release v1.5.12

---
 packages/app-desktop/package-lock.json | 2 +-
 packages/app-desktop/package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/app-desktop/package-lock.json b/packages/app-desktop/package-lock.json
index 1db80886b..1ff71a9c0 100644
--- a/packages/app-desktop/package-lock.json
+++ b/packages/app-desktop/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "@joplin/app-desktop",
-  "version": "1.5.11",
+  "version": "1.5.12",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/packages/app-desktop/package.json b/packages/app-desktop/package.json
index 9d394a484..e9cce91bb 100644
--- a/packages/app-desktop/package.json
+++ b/packages/app-desktop/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@joplin/app-desktop",
-  "version": "1.5.11",
+  "version": "1.5.12",
   "description": "Joplin for Desktop",
   "main": "main.js",
   "private": true,