gitlabFork/ISPConfig3.git - Solinfo Gitblit

ISPConfig3 devel

Marius Cramer

2015-03-06 39a2d33c4680fe0a0fcd10e864d075f520d9905e

refs
author	Marius Cramer <m.cramer@pixcept.de>
	Friday, March 6, 2015 07:22 -0500
committer	Marius Cramer <m.cramer@pixcept.de>
	Friday, March 6, 2015 07:22 -0500
commit	39a2d33c4680fe0a0fcd10e864d075f520d9905e
tree	3e0d3d104f5f43cd60fb039046a316e883ad8ad8 tree \| zip \| gz
parent	9d4bb8679bd2ef0934ac94ae3ccedc864c0078cc view \| diff ec4f1bad0a5123abffbe0f05f0eae7f9ce7e52e9 view \| diff

Merge branch 'master' into 'master'

Master

See merge request !171

4 files modified

	server/lib/classes/cron.d/500-backup.inc.php	2 ●●●●● diff \| view \| raw \| blame \| history
	server/lib/classes/cron.d/500-backup_mail.inc.php	3 ●●●●● diff \| view \| raw \| blame \| history
	server/lib/classes/system.inc.php	18 ●●●●● diff \| view \| raw \| blame \| history
	server/plugins-available/mail_plugin_dkim.inc.php	2 ●●●●● diff \| view \| raw \| blame \| history