Commit 7b7c688a authored by Till Brehm's avatar Till Brehm

Merge branch 'master' into 'master'

Fix for #4335 and removal of unnecessary file

See merge request !706
parents c31eeea0 b22ec4ad
user = {mysql_server_ispconfig_user}
password = {mysql_server_ispconfig_password}
dbname = {mysql_server_database}
table = mail_user
select_field = sender_cc
where_field = email
additional_conditions = and postfix = 'y' and disabledeliver = 'n' and disables$
hosts = 127.0.0.1
\ No newline at end of file
......@@ -5,4 +5,4 @@ table = mail_user
select_field = sender_cc
where_field = email
additional_conditions = and postfix = 'y' and disabledeliver = 'n' and disablesmtp = 'n' and sender_cc != ''
hosts = 127.0.0.1
\ No newline at end of file
hosts = {mysql_server_ip}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment