]> source.dussan.org Git - nextcloud-server.git/commitdiff
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)
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
1  2 
apps/user_ldap/lib/Access.php

Simple merge