Merge remote-tracking branch 'origin/master' into m41

# Conflicts:
#	src/public/javascripts/services/tree.js
This commit is contained in:
zadam 2020-02-02 10:45:27 +01:00
commit b946599320

View File

@ -248,6 +248,10 @@ function copySelectionToClipboard() {
} }
} }
function isCKEditorInitialized() {
return !!(window && window.cutToNote);
}
export default { export default {
reloadApp, reloadApp,
parseDate, parseDate,
@ -281,5 +285,6 @@ export default {
clearBrowserCache, clearBrowserCache,
getUrlForDownload, getUrlForDownload,
normalizeShortcut, normalizeShortcut,
copySelectionToClipboard copySelectionToClipboard,
isCKEditorInitialized
}; };