paxton
/
mailcow
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

master
andryyy 2020-05-30 22:28:17 +02:00
parent b30b0fe5a6 0a63e5e8ce
commit a84688e4a1
2 changed files with 10490 additions and 4312 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14768
data/web/_apidocs.html
View File

File diff suppressed because one or more lines are too long

2
update.sh
View File

@ -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)