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

2018-10-06 22:10:34 +02:00
parent 9f52cd9456 d735b93437
commit 152f6f3178
1 changed files with 2 additions and 0 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -22,3 +22,5 @@ data/conf/nginx/*.custom
 data/conf/nginx/*.bak
 data/conf/dovecot/extra.conf
 data/conf/rspamd/custom/*
+data/conf/portainer/
+docker-compose.override.yml