[Pkg-owncloud-commits] [owncloud] 60/78: Merge pull request #16114 from owncloud/stable7-backport-15510-and-15465

[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 f5a597b259e0df363a3049cc6d25cc817582e07c
Merge: d01bfe3 2c656b0
Author: Lukas Reschke <lukas at owncloud.com>
Date:   Fri May 8 12:13:24 2015 +0200

    Merge pull request #16114 from owncloud/stable7-backport-15510-and-15465
    
    [stable7] block cron.php and OCS API when in single user mode or maintenance mode

 cron.php                                          |  5 +++
 lib/base.php                                      | 38 ++++++++++++++---------
 lib/private/connector/sabre/maintenanceplugin.php |  3 ++
 ocs/v1.php                                        |  4 ++-
 public.php                                        |  2 +-
 5 files changed, 36 insertions(+), 16 deletions(-)

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