ISPConfig3 devel
parent: 1302aa | patch | commitdiff
Marius Cramer
2015-01-30 24625933313891b12d198b84c1d6f42d041fd3d7
refs
author Marius Cramer <m.cramer@pixcept.de>
Friday, January 30, 2015 09:07 -0500
committer Marius Cramer <m.cramer@pixcept.de>
Friday, January 30, 2015 09:07 -0500
commit24625933313891b12d198b84c1d6f42d041fd3d7
tree bf423cba8b6c123f966ad743c549e834b24f7242 tree | zip | gz
parent 1302aa509e21771044ab813bec89e722dca805ec view | diff
610315b8b6fd82e878d910e034304e1439461d60 view | diff 
Merge branch 'master' into 'master'

Master

See merge request !158
5 files modified
1 files added
101 ■■■■■ changed files
interface/web/dns/dns_dkim_edit.php 1 ●●●●● diff | view | raw | blame | history
interface/web/dns/dns_dmarc_edit.php 6 ●●●●● diff | view | raw | blame | history
interface/web/dns/dns_spf_edit.php 2 ●●●●● diff | view | raw | blame | history
interface/web/dns/form/dns_txt.tform.php 8 ●●●●● diff | view | raw | blame | history
interface/web/dns/templates/dns_spf_edit.htm 60 ●●●●● diff | view | raw | blame | history
interface/web/mail/mail_domain_edit.php 24 ●●●●● diff | view | raw | blame | history