Skip to content
  • Marius Cramer's avatar
    Merge remote-tracking branch 'florian030/master' · b533b414
    Marius Cramer authored
    Conflicts:
    	interface/lib/classes/validate_dkim.inc.php
    	interface/web/dns/dns_dkim_edit.php
    	interface/web/dns/dns_dkim_get.php
    	interface/web/dns/dns_wizard.php
    	interface/web/dns/form/dns_dkim.tform.php
    	interface/web/dns/lib/lang/en_dns_dkim.lng
    	interface/web/dns/templates/dns_dkim_edit.htm
    	interface/web/js/dns_dkim.js
    	interface/web/js/mail_domain_dkim.js
    	interface/web/mail/mail_domain_dkim_create.php
    b533b414