gitlabFork/ISPConfig3.git - Solinfo Gitblit

ISPConfig3 devel

Merge remote-tracking branch 'florian030/master'

Marius Cramer

2014-04-10 58964a90d06f523f991a67bd1068e1f504d1f8a9

refs
author	Marius Cramer <m.cramer@pixcept.de>
	Thursday, April 10, 2014 03:12 -0400
committer	Marius Cramer <m.cramer@pixcept.de>
	Thursday, April 10, 2014 03:12 -0400
commit	58964a90d06f523f991a67bd1068e1f504d1f8a9
tree	dc5e079838b42edb866aea605906dcf7c0c190a3 tree \| zip \| gz
parent	363ccfedb96d98cb6f03fd2ca44096dcb24c2c7f view \| diff ee23268b2f3b8d3f9511be36cbd2344202053e0f view \| diff

Merge remote-tracking branch 'florian030/master'

Conflicts:
	install/sql/incremental/upd_0073.sql
	install/sql/ispconfig3.sql

47 files modified

	interface/web/dns/dns_dkim_edit.php	8 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/dns_dkim_get.php	21 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/dns_wizard.php	8 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/lib/lang/ar_dns_dkim.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/lib/lang/bg_dns_dkim.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/lib/lang/br_dns_dkim.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/lib/lang/cz_dns_dkim.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/lib/lang/de_dns_dkim.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/lib/lang/en_dns_dkim.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/lib/lang/es_dns_dkim.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/lib/lang/fi_dns_dkim.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/lib/lang/fr_dns_dkim.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/lib/lang/hr_dns_dkim.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/lib/lang/hu_dns_dkim.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/lib/lang/id_dns_dkim.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/lib/lang/it_dns_dkim.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/lib/lang/ja_dns_dkim.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/lib/lang/nl_dns_dkim.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/lib/lang/ru_dns_dkim.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/lib/lang/se_dns_dkim.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/lib/lang/sk_dns_dkim.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/lib/lang/tr_dns_dkim.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/templates/dns_dkim_edit.htm	6 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/js/dns_dkim.js	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/form/mail_domain.tform.php	12 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/ar_mail_domain.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/bg_mail_domain.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/br_mail_domain.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/cz_mail_domain.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/de_mail_domain.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/en_mail_domain.lng	4 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/es_mail_domain.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/fi_mail_domain.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/fr_mail_domain.lng	4 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/hr_mail_domain.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/hu_mail_domain.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/id_mail_domain.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/it_mail_domain.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/nl_mail_domain.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/pl_mail_domain.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/pt_mail_domain.lng	8 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/ro_mail_domain.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/se_mail_domain.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/sk_mail_domain.lng	3 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/tr_mail_domain.lng	2 ●●●●● 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	31 ●●●●● diff \| view \| raw \| blame \| history