ISPConfig3 devel
parent: a07310 | patch | commitdiff
Marius Cramer
2015-02-18 c582da1780e3d11b0d12deb42de281b92d76bf6f
refs
author Marius Cramer <m.cramer@pixcept.de>
Wednesday, February 18, 2015 07:17 -0500
committer Marius Cramer <m.cramer@pixcept.de>
Wednesday, February 18, 2015 07:17 -0500
commitc582da1780e3d11b0d12deb42de281b92d76bf6f
tree 8e022caf3eb0a91f40a331d98cf3a6bf9ef0628d tree | zip | gz
parent a0731012e7a4c0c09cdf69b8d2a913e62f9b2a59 view | diff
412fe8897175b054b1b2f5931f428ec2a0a2f91f view | diff 
Merge branch 'master' into 'master'

Master

See merge request !167
5 files modified
273 ■■■■■ changed files
interface/web/dns/lib/lang/de_dns_dmarc.lng 30 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/de_dns_spf.lng 4 ●●●●● diff | view | raw | blame | history
interface/web/dns/templates/dns_dmarc_edit.htm 227 ●●●●● diff | view | raw | blame | history
interface/web/dns/templates/dns_spf_edit.htm 10 ●●●●● diff | view | raw | blame | history
interface/web/mail/templates/mail_domain_edit.htm 2 ●●●●● diff | view | raw | blame | history