gitlabFork/ISPConfig3.git - Solinfo Gitblit

ISPConfig3 devel

Marius Cramer

2013-11-21 1324b80369489bcf29c70c379e7bce49737f3db4

refs
author	Marius Cramer <m.cramer@pixcept.de>
	Thursday, November 21, 2013 11:29 -0500
committer	Marius Cramer <m.cramer@pixcept.de>
	Thursday, November 21, 2013 11:29 -0500
commit	1324b80369489bcf29c70c379e7bce49737f3db4
tree	e658f5632343acc4f479b27cfc296ac5f225939f tree \| zip \| gz
parent	f18ff1186203f8ada52b64561239c4ff69f730e6 view \| diff 18f479a2e70ba891fdacafcaa1813587ac87a9a3 view \| diff

Merge branch 'master' of /home/git/repositories/florian030/ispconfig3

11 files modified

	interface/web/dns/dns_dkim_edit.php	4 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/dns_soa_edit.php	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/dns_wizard.php	6 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/js/mail_domain_dkim.js	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/mail_domain_dkim_create.php	53 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/templates/mail_domain_edit.htm	8 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/tools/lib/lang/de_resync.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/tools/lib/lang/en_resync.lng	3 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/tools/resync.php	14 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/tools/templates/resync.htm	6 ●●●●● diff \| view \| raw \| blame \| history
	server/plugins-available/mail_plugin_dkim.inc.php	86 ●●●●● diff \| view \| raw \| blame \| history