• Marius Cramer's avatar
    Merge remote-tracking branch 'origin/stable-3.0.5' · 0832c839
    Marius Cramer authored
    Conflicts:
    	install/sql/ispconfig3.sql
    	install/tpl/config.inc.php.master
    	install/tpl/debian_postfix.conf.master
    	install/tpl/fedora_postfix.conf.master
    	install/tpl/gentoo_postfix.conf.master
    	install/tpl/opensuse_postfix.conf.master
    	interface/lib/config.inc.php
    	interface/web/sites/lib/lang/cz_web_subdomain.lng
    	interface/web/sites/lib/lang/cz_web_subdomain_list.lng
    	interface/web/sites/lib/lang/cz_web_vhost_subdomain_list.lng
    	interface/web/themes/blue/ispconfig_version
    0832c839
debian_postfix.conf.master 2.34 KB