[Pkg-owncloud-commits] [owncloud] 13/38: Merge pull request #13988 from owncloud/group-share-collition-wrong-type-in-post-hook-stable7

[David Prévot]

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

taffit pushed a commit to branch master
in repository owncloud.

commit e345ae7b53d3feaca7b8a51bc657193d09d13594
Merge: 9fd53ef 63e5282
Author: Lukas Reschke <lukas at owncloud.com>
Date:   Mon Feb 16 14:41:52 2015 +0100

    Merge pull request #13988 from owncloud/group-share-collition-wrong-type-in-post-hook-stable7
    
    [stable7] Do not overwrite the shareType so the post hook is still correct

 lib/private/share/share.php | 10 +++++-----
 tests/lib/share/share.php   | 10 ++++++++++
 2 files changed, 15 insertions(+), 5 deletions(-)

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