Merge branch 'stable-3.0.5'
Conflicts: install/sql/ispconfig3.sql install/tpl/config.inc.php.master interface/lib/classes/tform.inc.php interface/lib/config.inc.php interface/web/admin/server_config_edit.php interface/web/themes/blue/ispconfig_version interface/web/tools/import_plesk.php interface/web/tools/resync.php interface/web/vm/openvz_action.php
Loading
Please register or sign in to comment