gitlabFork/ISPConfig3.git - Solinfo Gitblit

ISPConfig3 devel

Marius Burkard

2015-12-23 6a00b4e599f724cbc9a12927c8a0446ef5621028

refs
author	Marius Burkard <m.burkard@pixcept.de>
	Wednesday, December 23, 2015 12:21 -0500
committer	Marius Burkard <m.burkard@pixcept.de>
	Wednesday, December 23, 2015 12:21 -0500
commit	6a00b4e599f724cbc9a12927c8a0446ef5621028
tree	b196527d95a7c881b1a542fcce8aaae67623bcd9 tree \| zip \| gz
parent	b25f400cd6bc255b01e05ac274f050ba4039a411 view \| diff de492a129186f5e1d0d1aad4173950b52ee778f3 view \| diff

Merge branch 'master' into 'master'

Master



See merge request !253

6 files modified

	install/install.php	1 ●●●●● diff \| view \| raw \| blame \| history
	install/lib/installer_base.lib.php	9 ●●●●● diff \| view \| raw \| blame \| history
	install/sql/incremental/upd_dev_collection.sql	2 ●●●●● diff \| view \| raw \| blame \| history
	install/update.php	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/form/server_ip.tform.php	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/web_vhost_domain_edit.php	2 ●●●●● diff \| view \| raw \| blame \| history