icingaweb2/library/Icinga/Protocol
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
..
File LogFileIterator: Fix missing closing bracket 2015-05-05 12:50:35 +02:00
Ldap Merge branch 'master' into feature/user-and-group-management-8826 2015-05-19 14:14:03 +02:00
Livestatus Use (only) "@return $this" in fluent interfaces' documentation 2015-04-07 14:24:11 +02:00
Nrpe 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
Dns.php 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