server/lib/classes/monitor_tools.inc.php · 52fe9e218582a6ddc9add9e0b68a855140763cbf · Helmo / ISPConfig 3

Source project has a limited visibility.

10 years ago

Merge remote-tracking branch 'origin/stable-3.0.5' · 1102cc88

Marius Cramer authored 10 years ago

Conflicts:
	install/sql/ispconfig3.sql
	install/tpl/config.inc.php.master
	install/uninstall.php
	interface/lib/config.inc.php
	interface/web/themes/blue/ispconfig_version

1102cc88

History

Merge remote-tracking branch 'origin/stable-3.0.5'

Marius Cramer authored 10 years ago

Conflicts:
	install/sql/ispconfig3.sql
	install/tpl/config.inc.php.master
	install/uninstall.php
	interface/lib/config.inc.php
	interface/web/themes/blue/ispconfig_version