gitlabFork/ISPConfig3.git - Solinfo Gitblit

ISPConfig3 devel

Marius Cramer

2015-02-18 a0731012e7a4c0c09cdf69b8d2a913e62f9b2a59

refs
author	Marius Cramer <m.cramer@pixcept.de>
	Wednesday, February 18, 2015 02:47 -0500
committer	Marius Cramer <m.cramer@pixcept.de>
	Wednesday, February 18, 2015 02:47 -0500
commit	a0731012e7a4c0c09cdf69b8d2a913e62f9b2a59
tree	b562bcb426cc6e45b947acb86c9e9a58ef626898 tree \| zip \| gz
parent	f86eb88e59a4f7247b377d4a58d9df1d29af6ee3 view \| diff 5a990b1da97156f1b73c79db80725f6574883f33 view \| diff

Merge branch 'master' into 'master'

Master

See merge request !166

5 files modified

	interface/web/dns/lib/lang/de_dns_dkim.lng	6 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/lib/lang/de_dns_dmarc.lng	38 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/de_mail_domain.lng	8 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/tools/resync.php	23 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/tools/templates/resync.htm	diff \| view \| raw \| blame \| history