-
Marius Cramer authored
Conflicts: install/sql/ispconfig3.sql install/tpl/config.inc.php.master interface/lib/config.inc.php interface/web/admin/lib/lang/de_system_config.lng
738c3d47
Conflicts: install/sql/ispconfig3.sql install/tpl/config.inc.php.master interface/lib/config.inc.php interface/web/admin/lib/lang/de_system_config.lng