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	icingacli web serve: Fix "PHP Notice: Use of undefined constant ICINGA_LIBDIR"	2014-11-14 16:02:17 +01:00
controllers	Do not redirect to the wizard in case of an empty config.ini	2014-11-18 13:13:02 +01:00
fonts/fontanello-ifont	Enable icon font	2014-11-13 20:08:58 +01:00
forms	Merge branch 'master' into bugfix/drop-zend-config-7147	2014-11-18 13:21:18 +01:00
layouts/scripts	PHP: avoid short tags <?	2014-10-23 10:44:54 +02:00
locale	Fix spelling issue in german translation catalog	2014-09-02 16:19:45 +02:00
views	Adjust usages of Icinga\Application\Config	2014-11-18 13:11:52 +01:00