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

View File

@@ -263,6 +263,8 @@ docker-compose down
# Silently fixing remote url from andryyy to mailcow
git remote set-url origin https://github.com/mailcow/mailcow-dockerized
echo -e "\e[32mCommitting current status...\e[0m"
[[ -z "$(git config user.name)" ]] && git config user.name moo
[[ -z "$(git config user.email)" ]] && git config user.email moo@cow.moo
git update-index --assume-unchanged data/conf/rspamd/override.d/worker-controller-password.inc
git add -u
git commit -am "Before update on ${DATE}" > /dev/null