浏览代码

Merge branch 'master' of https://github.com/mailcow/mailcow-dockerized

andryyy 5 年之前
父节点
当前提交
a84688e4a1
共有 2 个文件被更改,包括 6394 次插入4043 次删除
  1. 6393 4042
      data/web/_apidocs.html
  2. 1 1
      update.sh

文件差异内容过多而无法显示
+ 6393 - 4042
data/web/_apidocs.html


+ 1 - 1
update.sh

@@ -157,7 +157,7 @@ while (($#)); do
     echo './update.sh [-c|--check, --ours, --gc, --skip-start, -h|--help]
 
   -c|--check           -   Check for updates and exit (exit codes => 0: update available, 3: no updates)
-  --ours               -   Use merge strategy "ours" to solve conflicts in favor of non-mailcow code (local changes over remote changes), not recommended!
+  --ours               -   Use merge strategy option "ours" to solve conflicts in favor of non-mailcow code (local changes over remote changes), not recommended!
   --gc                 -   Run garbage collector to delete old image tags
   --no-update-compose  -   Do not update docker-compose
   --prefetch           -   Only prefetch new images and exit (useful to prepare updates)

部分文件因为文件数量过多而无法显示