gitlabFork/ISPConfig3.git - Solinfo Gitblit

ISPConfig3 devel

A. Täffner

2016-01-27 08791fea529813a60987010b45533bd307990138

refs
author	A. Täffner <darkalex@firesplash.de>
	Wednesday, January 27, 2016 04:55 -0500
committer	A. Täffner <darkalex@firesplash.de>
	Wednesday, January 27, 2016 04:55 -0500
commit	08791fea529813a60987010b45533bd307990138
tree	f726d3a16e0849b86b92a45b1312b79dae7637b1 tree \| zip \| gz
parent	228e0396d46055e38cf0567add98bd934a2e34cd view \| diff ab3c7dfb89aee966d336c2d68d0220d5a1b7893e view \| diff

Test: Merge branch 'master' into dns-dnssec

Conflicts:
	install/lib/installer_base.lib.php

6 files modified

	install/dist/conf/centos70.conf.php	2 ●●●●● diff \| view \| raw \| blame \| history
	install/lib/installer_base.lib.php	6 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/dns_wizard.php	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/form/dns_cname.tform.php	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/el_mail_domain.lng	9 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/ru_mail_domain.lng	9 ●●●●● diff \| view \| raw \| blame \| history