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

.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