interface/lib/classes/tform_base.inc.php · e9d5c95afbb562c6e1e5677013906b220070295b · ISPConfig / ISPConfig 3

"git@git.ispconfig.org:manoaratefy/ispconfig3.git" did not exist on "2f3e53f52ed6dde45f7809a1ef2a8a02424afe22"

9 years ago

Marius Cramer authored 9 years ago

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

History

Merge branch 'stable-3.0.5'

Marius Cramer authored 9 years ago

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