gitlabFork/ISPConfig3.git - Solinfo Gitblit

ISPConfig3 devel

Marius Cramer

2014-10-24 2d5fcd53c19a65b9c968a1db2e9af643537379c3

refs
author	Marius Cramer <m.cramer@pixcept.de>
	Friday, October 24, 2014 09:29 -0400
committer	Marius Cramer <m.cramer@pixcept.de>
	Friday, October 24, 2014 09:29 -0400
commit	2d5fcd53c19a65b9c968a1db2e9af643537379c3
tree	f6bc79edbd50cee70119f1559b5ad7b801e09147 tree \| zip \| gz
parent	7972151d0448b99e0ba28c819a698757c27c1d55 view \| diff 712363b14c4adcd0e9f5c0d2ea286471665f8d1c view \| diff

Merge branch 'master' into 'master'

Master

See merge request !132

5 files modified

	interface/web/mail/mail_domain_dkim_create.php	10 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/tools/resync_do.php	14 ●●●●● diff \| view \| raw \| blame \| history
	server/lib/classes/cron.d/300-quota_notify.inc.php	72 ●●●●● diff \| view \| raw \| blame \| history
	server/lib/classes/cron.d/500-backup_mail.inc.php	4 ●●●●● diff \| view \| raw \| blame \| history
	server/lib/classes/monitor_tools.inc.php	53 ●●●●● diff \| view \| raw \| blame \| history