Merge branch 'master' into admin-login

2019-03-31 15:49:18 +02:00
parent 220cda4449 40dda01d91
commit 987e884407
20 changed files with 157 additions and 66 deletions
--- a/update.sh
+++ b/update.sh
@@ -140,6 +140,7 @@ CONFIG_ARRAY=(
  "SOLR_HEAP"
  "SKIP_SOLR"
  "ALLOW_ADMIN_EMAIL_LOGIN"
+  "SKIP_HTTP_VERIFICATION"
 )

 sed -i '$a\' mailcow.conf