Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-10-31 02:16:05 +01:00
Code Issues Packages Projects Releases Activity

Merge remote-tracking branch 'origin/stable'

Browse Source 
# Conflicts:
#	src/services/options_init.js
This commit is contained in:
zadam
2020-07-28 23:50:54 +02:00
parent a7b62b30cb 8a57960c6e
commit e1dd933ec0
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/services/options_init.js
View File

@@ -51,7 +51,7 @@ function initNotSyncedOptions(initialized, startNotePath = 'root', opts = {}) {
optionService.createOption('theme', opts.theme || 'white', false);
optionService.createOption('syncServerHost', opts.syncServerHost || '', false);
optionService.createOption('syncServerTimeout', '5000', false);
optionService.createOption('syncServerTimeout', '60000', false);
optionService.createOption('syncProxy', opts.syncProxy || '', false);
}