[Pkg-owncloud-commits] [owncloud] 53/78: Merge pull request #15833 from owncloud/backport-files-external-fixes

[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 d01bfe3587a09a42214bfc83fe6081fbec31cdad
Merge: e72cd71 e37f9c8
Author: Lukas Reschke <lukas at owncloud.com>
Date:   Tue May 5 12:22:35 2015 +0200

    Merge pull request #15833 from owncloud/backport-files-external-fixes
    
    Backport files external fixes

 apps/files_external/js/settings.js | 45 ++++++++++++--------------------------
 core/routes.php                    |  4 ++++
 core/user/controller.php           | 31 ++++++++++++++++++++++++++
 3 files changed, 49 insertions(+), 31 deletions(-)

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