]> source.dussan.org Git - nextcloud-server.git/commitdiff
projects / nextcloud-server.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 949d7b3 9aef83b)
Merge pull request #11837 from owncloud/fix-11328
authorMorris Jobke <hey@morrisjobke.de>
Mon, 24 Nov 2014 17:13:01 +0000 (18:13 +0100)
committerMorris Jobke <hey@morrisjobke.de>
Mon, 24 Nov 2014 17:13:01 +0000 (18:13 +0100)
unify count filters and introduce display name attribute detection

1  2 
apps/user_ldap/tests/user_ldap.php patch | diff1 | diff2 | blob | history

diff --cc apps/user_ldap/tests/user_ldap.php
Simple merge
Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server