Skip to content
Commit b533b414 authored by Marius Cramer's avatar Marius Cramer
Browse files

Merge remote-tracking branch 'florian030/master'

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
parents 05beae43 b9ea02ce
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment