]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'master' into downstream-ldap-3 1729/head
authorArthur Schiwon <blizzz@arthur-schiwon.de>
Fri, 14 Oct 2016 15:14:36 +0000 (17:14 +0200)
committerArthur Schiwon <blizzz@arthur-schiwon.de>
Sun, 16 Oct 2016 12:42:16 +0000 (14:42 +0200)
commitdade28cadd3d73feaf665cfd338928643b7c5793
tree89741d6c6950cd409b24744cc50fbcc985f35021
parenta49d571799566d6b0e980a6dc73e641c07cc395d
parent62e19dfa8064c1d5a6d06d2d5c49e277716d4b4e
Merge branch 'master' into downstream-ldap-3

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
apps/user_ldap/lib/Access.php