[Pkg-owncloud-commits] [owncloud] 170/205: Merge pull request #17050 from owncloud/request-status-from-ocs

[David Prévot]

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

taffit pushed a commit to branch stable8
in repository owncloud.

commit 5810e7ab87bd4ce69107cdaf2689154e2e59ab5c
Merge: aa59539 30145c0
Author: Lukas Reschke <lukas at owncloud.com>
Date:   Mon Jun 29 13:41:11 2015 +0200

    Merge pull request #17050 from owncloud/request-status-from-ocs
    
    Request approved state for disabled apps with ocsid

 lib/private/ocsclient.php                     |  1 +
 settings/controller/appsettingscontroller.php | 18 ++++++++++++++++++
 tests/lib/ocsclienttest.php                   |  2 ++
 3 files changed, 21 insertions(+)


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