[Pkg-owncloud-commits] [owncloud] 05/16: Merge pull request #17954 from owncloud/backport-17464-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 9d270bcc46212ee5ae61ce2767d53f0a3c7f76ab
Merge: 0f2ea52 d44a656
Author: Morris Jobke <hey at morrisjobke.de>
Date:   Mon Sep 28 11:52:23 2015 +0200

    Merge pull request #17954 from owncloud/backport-17464-stable7
    
    fix uncaught exception on not permitted file types when setting avata…

 apps/user_ldap/lib/user/user.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

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