[Pkg-owncloud-commits] [owncloud] 12/86: Merge pull request #20246 from owncloud/backport-20192-stable8.1

[David Prévot]

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

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

commit ec999816d2940b5cebf3fcb60382825fef7e16c2
Merge: 0c8bce9 21600c7
Author: Vincent Petry <pvince81 at owncloud.com>
Date:   Thu Nov 5 17:26:23 2015 +0100

    Merge pull request #20246 from owncloud/backport-20192-stable8.1
    
    [backport] [stable8.1] if a user that is flag as deleted shows up again, remove that flag. F…

 apps/user_ldap/lib/access.php           | 5 +++++
 apps/user_ldap/lib/user/offlineuser.php | 7 +++++++
 2 files changed, 12 insertions(+)


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