• Marius Cramer's avatar
    Merge branch 'stable-3.0.5' · 8cb6f8ff
    Marius Cramer authored
    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
    8cb6f8ff
remote_action_osupdate.php 3.52 KB