gitlabFork/ISPConfig3.git - Solinfo Gitblit

ISPConfig3 devel

Marius Burkard

2016-01-26 b3e7785b3ab5ea70675e0d944b3a746464c4143f

refs
author	Marius Burkard <m.burkard@pixcept.de>
	Tuesday, January 26, 2016 03:53 -0500
committer	Marius Burkard <m.burkard@pixcept.de>
	Tuesday, January 26, 2016 03:53 -0500
commit	b3e7785b3ab5ea70675e0d944b3a746464c4143f
tree	112e43695661700556994d1a3a02ec2834182484 tree \| zip \| gz
parent	bdb3e8057e46d5e69bae3dffb4d2669090b0ee8f view \| diff d63ceade2147e2e89b34f603c80def6eb4aaabeb view \| diff

Merge branch 'master' into 'stable-3.1'

FS#4070 - DMARC CNAMES cannot be added to ISPConfig



See merge request !271

5 files modified

	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