icingaweb2/modules
Eric Lippmann 0e7ca591ec Merge branch 'master' into bugfix/commands-6593
Conflicts:
	application/forms/Preference/GeneralForm.php
	application/views/helpers/FormDateTime.php
	modules/monitoring/application/forms/Command/CommandForm.php
2014-09-08 10:16:05 +02:00
..
doc Doc/IcingaWebController: Fix "The ... with non-compound name ... has no effect" 2014-09-04 14:53:00 +02:00
monitoring Merge branch 'master' into bugfix/commands-6593 2014-09-08 10:16:05 +02:00
test Remove missed echo instruction for debug purposes 2014-06-30 14:06:11 +02:00
translation Throw IcingaException rather than Exception 2014-08-27 16:03:15 +02:00