Johannes Meyer c288a68ed5 Merge branch 'master' into bugfix/drop-zend-config-7147 ...

Conflicts:
	application/forms/LdapDiscoveryForm.php

2014-11-18 13:21:18 +01:00

..

clicommands

CLI/monitoring/list: fix DataView-related exception

2014-07-31 17:24:56 +02:00

controllers

Fix anonymous onSuccess callbacks

2014-11-18 13:12:30 +01:00

forms

Adjust usages of Icinga\Application\Config

2014-11-18 13:11:52 +01:00

locale

Fix spelling mistake: Unandled -> Unhandled

2014-09-05 23:42:49 +02:00

views

Adjust vars to the coding guidelines

2014-11-18 10:29:47 +01:00