ISPConfig3 devel
parent: 05beae | patch | commitdiff
Marius Cramer
2013-10-21 b533b414a075013307447a3fb895b1625504d477
refs
author Marius Cramer <m.cramer@pixcept.de>
Monday, October 21, 2013 07:15 -0400
committer Marius Cramer <m.cramer@pixcept.de>
Monday, October 21, 2013 07:15 -0400
commitb533b414a075013307447a3fb895b1625504d477
tree 9122929488d43bd652c8ebc3a9d249589ce4f663 tree | zip | gz
parent 05beae43cfeb15ea89b984d36105dcdbdffd0975 view | diff
b9ea02ce477d17d44eedd94d6fed3199569a472d view | diff 
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
16 files modified
1508 ■■■■■ changed files
install/dist/lib/opensuse.lib.php 2 ●●●●● diff | view | raw | blame | history
interface/lib/classes/validate_dkim.inc.php 84 ●●●●● diff | view | raw | blame | history
interface/web/admin/form/server_config.tform.php 8 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/de_server_config.lng 4 ●●●●● diff | view | raw | blame | history
interface/web/dns/dns_dkim_edit.php 284 ●●●●● diff | view | raw | blame | history
interface/web/dns/dns_dkim_get.php 190 ●●●●● diff | view | raw | blame | history
interface/web/dns/dns_wizard.php 15 ●●●●● diff | view | raw | blame | history
interface/web/dns/form/dns_dkim.tform.php 308 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/en_dns_dkim.lng 16 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/en_dns_wizard.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/dns/templates/dns_dkim_edit.htm 76 ●●●●● diff | view | raw | blame | history
interface/web/js/dns_dkim.js 144 ●●●●● diff | view | raw | blame | history
interface/web/js/mail_domain_dkim.js 143 ●●●●● diff | view | raw | blame | history
interface/web/mail/mail_domain_dkim_create.php 122 ●●●●● diff | view | raw | blame | history
interface/web/mail/templates/mail_domain_edit.htm 4 ●●●●● diff | view | raw | blame | history
server/plugins-available/mail_plugin_dkim.inc.php 106 ●●●●● diff | view | raw | blame | history