gitlabFork/ISPConfig3.git - Solinfo Gitblit

ISPConfig3 devel

Till Brehm

2016-04-22 8cad78372e31c0f9c06be4654fbf59d85ef11f0e

refs
author	Till Brehm <tbrehm@ispconfig.org>
	Friday, April 22, 2016 03:41 -0400
committer	Till Brehm <tbrehm@ispconfig.org>
	Friday, April 22, 2016 03:41 -0400
commit	8cad78372e31c0f9c06be4654fbf59d85ef11f0e
tree	505f5695d83c63bf204e231ba48be068cf4233f2 tree \| zip \| gz
parent	404c729302f2536edb1cc9aebf63d9e89753438e view \| diff 17d53616b36fef3b753fc408bfc600f360673333 view \| diff

Merge branch 'stable-3.1' of git.ispconfig.org:ispconfig/ispconfig3 into stable-3.1

2 files renamed

6 files modified

	interface/web/admin/templates/server_config_rescue_edit.htm	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/monitor/lib/module.conf.php	3 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/monitor/show_data.php	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/database_user_edit.php	5 ●●●●● diff \| view \| raw \| blame \| history
	server/lib/classes/cron.d/100-monitor_mongodb.inc.php~	diff \| view \| raw \| blame \| history
	server/lib/classes/monitor_tools.inc.php	4 ●●●●● diff \| view \| raw \| blame \| history
	server/mods-available/rescue_core_module.inc.php	59 ●●●●● diff \| view \| raw \| blame \| history
	server/plugins-available/mongo_clientdb_plugin.inc.php~	diff \| view \| raw \| blame \| history