gitlabFork/ISPConfig3.git - Solinfo Gitblit

ISPConfig3 devel

Marius Cramer

2014-01-02 0d11ae2055fe36d390e55065fa846c848a04ad07

refs
author	Marius Cramer <m.cramer@pixcept.de>
	Thursday, January 2, 2014 08:47 -0500
committer	Marius Cramer <m.cramer@pixcept.de>
	Thursday, January 2, 2014 08:47 -0500
commit	0d11ae2055fe36d390e55065fa846c848a04ad07
tree	b807c49b56c2b9826142f810366de36edd1f7c4b tree \| zip \| gz
parent	6b1d788d1d50fd38f68f152285f3fa816a9d7880 view \| diff 91c842be76f7f7ac693577f61fb579728ad2e5d8 view \| diff

Merge branch 'master' of /home/git/repositories/florian030/ispconfig3

9 files modified

	interface/lib/classes/functions.inc.php	4 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/mail_user_stats.php	18 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/templates/mail_user_stats_list.htm	10 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/user_quota_stats.php	6 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/templates/web_sites_stats_list.htm	10 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/user_quota_stats.php	15 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/web_sites_stats.php	27 ●●●●● diff \| view \| raw \| blame \| history
	server/lib/classes/cron.d/500-backup.inc.php	13 ●●●●● diff \| view \| raw \| blame \| history
	server/lib/classes/functions.inc.php	12 ●●●●● diff \| view \| raw \| blame \| history