Merge branch 'master' into patch-1

This commit is contained in:
Abhilash Raj
2017-07-24 17:23:11 -07:00
committed by GitHub

View File

@@ -40,10 +40,6 @@ if [[ ! -v SMTP_PORT ]]; then
export SMTP_PORT=25
fi
if [[ ! -v HYPERKITTY_URL ]]; then
export HYPERKITTY_URL=http://mailman-web:8000/
fi
function setup_database () {
if [[ ! -v DATABASE_URL ]]