Skip to content
Commit 0832c839 authored by Marius Cramer's avatar Marius Cramer
Browse files

Merge remote-tracking branch 'origin/stable-3.0.5'

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
parents 773b716e 9cb6fe13
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