server/lib/classes/aps_installer.inc.php · f6174df192779fc7e1b6ce7b39e9682bb79d555c · Helmo / ISPConfig 3

Source project has a limited visibility.

11 years ago

Merge remote-tracking branch 'origin/stable-3.0.5' · 3faab0ca

Marius Cramer authored 11 years ago

Conflicts:
	interface/web/sites/lib/lang/de_web_folder.lng
	interface/web/sites/lib/lang/de_web_folder_user.lng
	interface/web/sites/lib/lang/de_web_vhost_domain.lng
	interface/web/sites/lib/lang/en_web_domain.lng
	server/lib/classes/db_mysql.inc.php

3faab0ca

History

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

Marius Cramer authored 11 years ago

Conflicts:
	interface/web/sites/lib/lang/de_web_folder.lng
	interface/web/sites/lib/lang/de_web_folder_user.lng
	interface/web/sites/lib/lang/de_web_vhost_domain.lng
	interface/web/sites/lib/lang/en_web_domain.lng
	server/lib/classes/db_mysql.inc.php