Johannes Meyer 1c51735629 Merge branch 'master' into feature/rename-monitoring-instances-to-command-transports-and-allow-to-link-them-with-a-monitoring-instance-9651 ... Conflicts: modules/monitoring/application/controllers/ConfigController.php		2015-08-31 13:05:10 +02:00
..
doc	doc: Fix PHPDoc of IcingawebController::getPath()	2015-08-27 14:40:49 +02:00
monitoring	Merge branch 'master' into feature/rename-monitoring-instances-to-command-transports-and-allow-to-link-them-with-a-monitoring-instance-9651	2015-08-31 13:05:10 +02:00
setup	wizard: Show a warning if the IDO is used for the internal database	2015-08-28 15:25:40 +02:00
test	Documentation: use command line arguments in the format --arg=<value>	2015-06-10 17:20:27 +02:00
translation	translation: Always use the correct path to the Icinga library in the translation helper	2015-07-31 11:30:26 +02:00