icingaweb2/test/php/library/Icinga
Johannes Meyer fb07f0b94c Merge branch 'master' into feature/user-and-group-management-8826
Conflicts:
	library/Icinga/Authentication/Backend/LdapUserBackend.php
	library/Icinga/Protocol/Ldap/Query.php
2015-05-19 14:14:03 +02:00
..
Application Note that our license is GPL v2 or any later version in our license header instead of pointing to the license's URL 2015-02-04 10:52:27 +01:00
Chart Note that our license is GPL v2 or any later version in our license header instead of pointing to the license's URL 2015-02-04 10:52:27 +01:00
Data Merge branch 'master' into feature/user-and-group-management-8826 2015-05-19 14:14:03 +02:00
File Fix some spelling errors in comments and messages 2015-03-08 15:32:22 +01:00
Logger/Writer Note that our license is GPL v2 or any later version in our license header instead of pointing to the license's URL 2015-02-04 10:52:27 +01:00
Protocol/Ldap Drop Icinga\Protocol\Ldap\ConnectionTest 2015-05-04 13:40:54 +02:00
Test Note that our license is GPL v2 or any later version in our license header instead of pointing to the license's URL 2015-02-04 10:52:27 +01:00
User Note that our license is GPL v2 or any later version in our license header instead of pointing to the license's URL 2015-02-04 10:52:27 +01:00
Util Note that our license is GPL v2 or any later version in our license header instead of pointing to the license's URL 2015-02-04 10:52:27 +01:00
Web Note that our license is GPL v2 or any later version in our license header instead of pointing to the license's URL 2015-02-04 10:52:27 +01:00
UserTest.php UserTest: Fix wrong assert condition for wildcard 2015-05-07 17:19:00 +02:00