interface/web/js/dns_dkim.js · e8b3291ecd0c5278b9ddc274769a3809e92f5c16 · Helmo / ISPConfig 3

"git@git.ispconfig.org:helmo/ispconfig3.git" did not exist on "516e0e8ce0a998f95bd07e5bab812d979a5ea802"

Blame

Forked from ISPConfig / ISPConfig 3

5703 commits behind the upstream repository.

11 years ago

b533b414

Merge remote-tracking branch 'florian030/master' · b533b414

Marius Cramer authored 11 years ago

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

History

Merge remote-tracking branch 'florian030/master'

Marius Cramer authored 11 years ago

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