Merge branch 'master' into m41

# Conflicts:
#	src/public/javascripts/services/sidebar.js
#	src/public/javascripts/services/tab_context.js
#	src/public/javascripts/services/tree.js
This commit is contained in:
zadam
2020-02-01 20:01:30 +01:00
5 changed files with 8 additions and 4 deletions

View File

@@ -86,6 +86,8 @@ async function showTree() {
});
}
});
treeService.setTree($.ui.fancytree.getTree("#tree"));
}
$detail.on("click", ".note-menu-button", async e => {