Merge branch 'master' into master

This commit is contained in:
Markus Heberling
2019-01-01 14:20:22 +01:00
committed by GitHub
51 changed files with 2305 additions and 645 deletions

2
.gitignore vendored
View File

@@ -1,10 +1,12 @@
rebuild-images.sh
data/conf/sogo/sieve.creds
data/conf/dovecot/dovecot-master.passwd
data/conf/dovecot/dovecot-master.userdb
mailcow.conf
mailcow.conf_backup
data/conf/nginx/*.active
data/conf/postfix/sql
data/conf/postfix/allow_mailcow_local.regexp
data/conf/dovecot/sql
data/conf/nextcloud-*.bak
data/web/inc/vars.local.inc.php