gitlabFork/ISPConfig3.git - Solinfo Gitblit

ISPConfig3 devel

Marius Burkard

2016-04-22 17d53616b36fef3b753fc408bfc600f360673333

refs
author	Marius Burkard <m.burkard@pixcept.de>
	Friday, April 22, 2016 02:14 -0400
committer	Marius Burkard <m.burkard@pixcept.de>
	Friday, April 22, 2016 02:14 -0400
commit	17d53616b36fef3b753fc408bfc600f360673333
tree	5c0fb7947b06880cc34d87de20b432915fc0cec5 tree \| zip \| gz
parent	8b608ccc13e4d689143265ea6039c2e0ec563016 view \| diff e7ae4ef2c82ec1d22fec6ae4f0dbdc8e6afd73e9 view \| diff

Merge branch 'master' into 'stable-3.1'

Master



See merge request !318

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