Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-12 08:15:52 +01:00
Code Issues Packages Projects Releases Activity

Merge remote-tracking branch 'origin/stable'

Browse Source 
# Conflicts:
#	package.json
#	src/routes/api/clipper.js
This commit is contained in:
zadam
2020-07-15 00:11:26 +02:00
parent 64dc522b27 443f389d73
commit f028b88cce
4 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/views/setup.ejs
View File

@@ -193,10 +193,11 @@
</div>
<script type="text/javascript">
const glob = {
window.glob = {
sourceId: ''
};
const syncInProgress = <%= syncInProgress ? 'true' : 'false' %>;
window.syncInProgress = <%= syncInProgress ? 'true' : 'false' %>;
</script>
<!-- Required for correct loading of scripts in Electron -->