zadam 90d10c1ff3 Merge branch 'stable' ... # Conflicts: # package-lock.json # src/public/javascripts/services/tree_context_menu.js # src/services/import/enex.js		2019-11-27 18:54:49 +01:00
..
dialogs	Merge branch 'stable'	2019-11-27 18:54:49 +01:00
entities	new "iconClass" property on note_short, now together with cssClass respecting template relationship, #707	2019-11-16 08:59:27 +01:00
services	Merge branch 'stable'	2019-11-27 18:54:49 +01:00
widgets	shortcuts WIP	2019-11-19 20:53:04 +01:00
desktop.js	shortcut fixes	2019-11-24 22:15:33 +01:00
mobile.js	refactoring of legacy js events	2019-11-09 17:45:22 +01:00
setup.js	fix setup on non-root paths #404	2019-11-22 20:24:49 +01:00