Johannes Meyer 9d292269b1 Merge branch 'master' into feature/setup-wizard-7163 ... Conflicts: application/forms/Config/Resource/LdapResourceForm.php test/php/application/forms/Config/Authentication/LdapBackendFormTest.php		2014-11-11 09:44:11 +01:00
..
application	Merge branch 'master' into feature/setup-wizard-7163	2014-11-11 09:44:11 +01:00
library/Icinga	Merge branch 'master' into feature/setup-wizard-7163	2014-11-11 09:44:11 +01:00
regression	Fix that Icinga\Web\Url::fromPath drops fragments	2014-08-14 14:23:31 +02:00
res	Extend TranslatorTest with new tests	2014-09-16 16:14:07 +02:00
bootstrap.php	Remove license headers from all files	2014-07-15 13:43:52 +02:00