gitlabFork/ISPConfig3.git - Solinfo Gitblit

ISPConfig3 devel

Marius Cramer

2014-11-06 a66bbd6cba18494f48190025b525f903ef3d384d

refs
author	Marius Cramer <m.cramer@pixcept.de>
	Thursday, November 6, 2014 05:24 -0500
committer	Marius Cramer <m.cramer@pixcept.de>
	Thursday, November 6, 2014 05:24 -0500
commit	a66bbd6cba18494f48190025b525f903ef3d384d
tree	98a88fb245a9bf306c6e39138b6c154493a374c0 tree \| zip \| gz
parent	c28bb43232ab64cd17fc359fc482fc274974822f view \| diff 208a069f90fe68ecf2242b8ef177b1a5a0095f00 view \| diff

Merge branch 'master' into 'master'

Master

See merge request !138

8 files modified

	interface/web/mail/mail_domain_dkim_create.php	2 ●●●●● diff \| view \| raw \| blame \| history
	server/lib/classes/cron.d/500-backup.inc.php	66 ●●●●● diff \| view \| raw \| blame \| history
	server/lib/classes/cron.d/500-backup_mail.inc.php	38 ●●●●● diff \| view \| raw \| blame \| history
	server/lib/classes/system.inc.php	16 ●●●●● diff \| view \| raw \| blame \| history
	server/plugins-available/apache2_plugin.inc.php	18 ●●●●● diff \| view \| raw \| blame \| history
	server/plugins-available/backup_plugin.inc.php	38 ●●●●● diff \| view \| raw \| blame \| history
	server/plugins-available/mail_plugin.inc.php	36 ●●●●● diff \| view \| raw \| blame \| history
	server/plugins-available/nginx_plugin.inc.php	22 ●●●●● diff \| view \| raw \| blame \| history