Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-30 05:18:49 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge remote-tracking branch 'origin/dev' into dev

Browse source
This commit is contained in:
Vanessa 2023-11-22 16:18:43 +08:00
commit 62f30ca856
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/guide/20210808180117-6v0mkxr/20200923234011-ieuun1p/20230805231614-vqn28eh/20210808180303-v9awwp0/20210721112206-mhr9wxi.sy
View file

@ -1424,11 +1424,11 @@
{
"Type": "NodeTextMark",
"TextMarkType": "code",
"TextMarkTextContent": "7000"
"TextMarkTextContent": "12000"
},
{
"Type": "NodeText",
"Data": "​ (7 seconds), and the maximum value is not limited; when starting, environment variables will be read first to overwrite the values in the conf file."
"Data": "​ (12 seconds), and the maximum value is not limited; when starting, environment variables will be read first to overwrite the values in the conf file."
}
]
}

4
app/guide/20210808180117-czj9bvb/20200812220555-lj3enxa/20230805222417-2lj3dvk/20230808120348-orm8sjf/20230808120347-3cob0nb.sy
View file

@ -1400,11 +1400,11 @@
{
"Type": "NodeTextMark",
"TextMarkType": "code",
"TextMarkTextContent": "7000"
"TextMarkTextContent": "12000"
},
{
"Type": "NodeText",
"Data": "​（7 秒），最大值不限制；启动时会优先读取环境变量覆盖 conf 文件中的值。"
"Data": "​（12 秒），最大值不限制；启动时会优先读取环境变量覆盖 conf 文件中的值。"
}
]
}

4
app/guide/20211226090932-5lcq56f/20211226115423-d5z1joq/20230805232636-zh0adz2/20211226121232-23s79xr/20211226121438-xaafdo8.sy
View file

@ -1401,11 +1401,11 @@
{
"Type": "NodeTextMark",
"TextMarkType": "code",
"TextMarkTextContent": "7000"
"TextMarkTextContent": "12000"
},
{
"Type": "NodeText",
"Data": "​（7 秒），最大值不限制；啟動時會優先讀取環境變數覆蓋 conf 檔案中的值。"
"Data": "​（12 秒），最大值不限制；啟動時會優先讀取環境變數覆蓋 conf 檔案中的值。"
}
]
}