[Pkg-owncloud-commits] [owncloud] 123/131: Merge pull request #18003 from owncloud/backport-17805-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.1
in repository owncloud.

commit cf4f43363c4cf3cfd64634a6cf33a458018a7f57
Merge: a9524e2 ef2eeae
Author: Roeland Douma <rullzer at users.noreply.github.com>
Date:   Fri Jul 31 10:46:18 2015 +0200

    Merge pull request #18003 from owncloud/backport-17805-stable8.1
    
    [stable8.1][avatar] add error handlers for avatar setup

 core/avatar/avatarcontroller.php           |  8 +++++++
 settings/js/personal.js                    | 34 +++++++++++++++++++++++++++++-
 settings/templates/personal.php            |  2 +-
 tests/core/avatar/avatarcontrollertest.php | 21 ++++++++++++++----
 4 files changed, 59 insertions(+), 6 deletions(-)


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