gitlabFork/ISPConfig3.git - Solinfo Gitblit

ISPConfig3 devel

Marius Cramer

2015-01-21 c0138f5488dc19898c9e6c2df6c6264ee618e77c

refs
author	Marius Cramer <m.cramer@pixcept.de>
	Wednesday, January 21, 2015 04:09 -0500
committer	Marius Cramer <m.cramer@pixcept.de>
	Wednesday, January 21, 2015 04:09 -0500
commit	c0138f5488dc19898c9e6c2df6c6264ee618e77c
tree	2159ae7dc9f5a1f25488d71562da9bb1311dd98c tree \| zip \| gz
parent	f3f4aa5c5498c5af4b9248807d9720b13891b2ab view \| diff 55c012f85a6768b2e6a918de3a4f8bba6fd8cc6e view \| diff

Merge branch 'master' into 'master'

Master

See merge request !157

27 files modified

	interface/web/sites/database_quota_stats.php	29 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/ar_database_quota_stats_list.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/bg_database_quota_stats_list.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/br_database_quota_stats_list.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/cz_database_quota_stats_list.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/de_database_quota_stats_list.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/el_database_quota_stats_list.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/en_database_quota_stats_list.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/es_database_quota_stats_list.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/fi_database_quota_stats_list.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/fr_database_quota_stats_list.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/hr_database_quota_stats_list.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/hu_database_quota_stats_list.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/id_database_quota_stats_list.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/it_database_quota_stats_list.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/ja_database_quota_stats_list.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/nl_database_quota_stats_list.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/pl_database_quota_stats_list.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/pt_database_quota_stats_list.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/ro_database_quota_stats_list.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/ru_database_quota_stats_list.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/se_database_quota_stats_list.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/sk_database_quota_stats_list.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/lib/lang/tr_database_quota_stats_list.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/list/database_quota_stats.list.php	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/templates/database_quota_stats_list.htm	2 ●●●●● diff \| view \| raw \| blame \| history
	server/plugins-available/mail_plugin.inc.php	29 ●●●●● diff \| view \| raw \| blame \| history