[Pkg-owncloud-commits] [owncloud] 23/27: Merge pull request #19972 from owncloud/stable8.1-backport-19635

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to annotated tag v8.1.4RC2
in repository owncloud.

commit 3387d05ca9e512b330b5879afd9f5d5583c04aa4
Merge: 74871b1 cc9d5e4
Author: Morris Jobke <hey at morrisjobke.de>
Date:   Tue Oct 27 14:08:26 2015 +0100

    Merge pull request #19972 from owncloud/stable8.1-backport-19635
    
    [stable8.1] allow an attribute to return more than one value

 apps/user_ldap/group_ldap.php         |   8 +-
 apps/user_ldap/lib/access.php         | 109 ++++++++++++------
 apps/user_ldap/lib/user/manager.php   |  37 ++++++
 apps/user_ldap/lib/user/user.php      | 186 +++++++++++++++++++++++++-----
 apps/user_ldap/lib/wizard.php         |   6 +-
 apps/user_ldap/tests/access.php       |  77 +++++++++++--
 apps/user_ldap/tests/group_ldap.php   |  21 ++--
 apps/user_ldap/tests/user/manager.php |  42 +++++++
 apps/user_ldap/tests/user/user.php    | 207 +++++++++++++++++++++++++++++++++-
 apps/user_ldap/tests/user_ldap.php    |  22 ++--
 apps/user_ldap/user_ldap.php          |  78 +++++--------
 11 files changed, 644 insertions(+), 149 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git