Joplin
/
joplin
mirror of https://github.com/laurent22/joplin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release-1.5' into dev

pull/4258/head
Laurent Cozic 2020-12-28 14:31:37 +00:00
parent 41684a64ef 66a5490b54
commit 29177330b0
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/app-desktop/package-lock.json generated
View File

@ -1,6 +1,6 @@
{
"name": "@joplin/app-desktop",
"version": "1.5.11",
"version": "1.5.12",
"lockfileVersion": 1,
"requires": true,
"dependencies": {

2
packages/lib/import-enex-md-gen.js
View File

@ -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];