Master



See merge request !302

fixed sieve mail filter creation

if the filter rule uses "begins with", the regex should be "^$searchterm" instead of " $searchterm"

See merge request !297

fixed typo



See merge request !300

fixed bastille-detection during install



See merge request !298

if the filter rule uses "begins with", the regex should be "^$searchterm" instead of " $searchterm"

changed regex for backup_dir (allow empty backup-dir to disable backups)



See merge request !296

fixed dns-import for dmarc and dkim (Fixes #3792)



See merge request !294

missing new line at the end of the line causes conflicts with the following line



See merge request !295

Fix #3787 Remove wrong fastcgi_param SCRIPT_FILENAME for Mailman in nginx_apps.vhost.master



See merge request !292

Master



See merge request !293

Git attributes file to make sure Windows developers don't commit bad line endings.

To obey http://git.ispconfig.org/ispconfig/ispconfig3/blob/45e9406a0fd6e872219a09d913bdfa49bd22e87b/CODING_NOTES.php.txt#L3

https://help.github.com/articles/dealing-with-line-endings/

See merge request !290