gitlabFork/ISPConfig3.git - Solinfo Gitblit

ISPConfig3 devel

Marius Cramer

2015-01-14 9bde82f26b822f1ef59277796492f363c0f6288f

refs
author	Marius Cramer <m.cramer@pixcept.de>
	Wednesday, January 14, 2015 05:08 -0500
committer	Marius Cramer <m.cramer@pixcept.de>
	Wednesday, January 14, 2015 05:08 -0500
commit	9bde82f26b822f1ef59277796492f363c0f6288f
tree	e4181e36a2ba983055d0ff3d0fb2e933736205ad tree \| zip \| gz
parent	b82b9939965fade914914175a91bd8d44f56ac74 view \| diff 02872aadb2db4f31d60eec167d0c56d669ea65f3 view \| diff

Merge branch 'master' into 'master'

Master

See merge request !155

5 files added

2 files modified

	interface/web/mail/backup_stats.php	38 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/de_backup_stats_list.lng	9 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/lang/en_backup_stats_list.lng	9 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/lib/module.conf.php	6 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/list/backup_stats.list.php	54 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/mail/templates/backup_stats_list.htm	40 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/tools/lib/lang/fr_resync.lng	23 ●●●●● diff \| view \| raw \| blame \| history