Browse Source

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

andryyy 5 years ago
parent
commit
a84688e4a1
2 changed files with 6394 additions and 4043 deletions
  1. 6393 4042
      data/web/_apidocs.html
  2. 1 1
      update.sh

File diff suppressed because it is too large
+ 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)

Some files were not shown because too many files changed in this diff