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/Webserver Setup: Rename webPath to urlPath

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

controllers

Change route icingaweb/setup/setup to icingaweb/setup

2014-11-10 16:43:37 +01:00

forms

Merge branch 'master' into bugfix/drop-zend-config-7147

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

views/scripts

Enable icon font

2014-11-13 20:08:58 +01:00