gitlabFork/ISPConfig3.git - Solinfo Gitblit

ISPConfig3 devel

Marius Cramer

2015-01-08 513a1785121fe98ced58bb0713885926a1ee42a9

refs
author	Marius Cramer <m.cramer@pixcept.de>
	Thursday, January 8, 2015 14:08 -0500
committer	Marius Cramer <m.cramer@pixcept.de>
	Thursday, January 8, 2015 14:08 -0500
commit	513a1785121fe98ced58bb0713885926a1ee42a9
tree	e30fc966e3675200ea89e949119dc63f5a69123a tree \| zip \| gz
parent	c4c549eff3d39d4a1bfc83e138b47110bd51cb55 view \| diff 0e72ef1fd668741f348fa71382dca32cd03dd0c3 view \| diff

Merge branch 'master' into 'master'

Master

See merge request !150

7 files modified

1 files added

	install/sql/incremental/upd_0081.sql	19 ●●●●● diff \| view \| raw \| blame \| history
	install/sql/ispconfig3.sql	3 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/dns_dkim_edit.php	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/lib/lang/fr_dns_wizard.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/es_mail_get.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/mail_domain_dkim_create.php	4 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/remote.conf.php	3 ●●●●● diff \| view \| raw \| blame \| history
	server/plugins-available/mail_plugin.inc.php	2 ●●●●● diff \| view \| raw \| blame \| history