[Pkg-owncloud-commits] [owncloud] 20/67: Merge pull request #8974 from owncloud/router-preventloadappsonupgrade

[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 8c8209828126a55b9bf775e00cbc14d7ef7db5ae
Merge: 4d216e8 7992054
Author: Vincent Petry <pvince81 at owncloud.com>
Date:   Mon Jun 23 15:15:50 2014 +0200

    Merge pull request #8974 from owncloud/router-preventloadappsonupgrade
    
    Prevent loadApps on upgrade

 lib/base.php                 | 18 ++++++------------
 lib/private/route/router.php |  4 +++-
 lib/private/util.php         | 17 ++++++++++++++++-
 lib/public/util.php          |  9 +++++++++
 4 files changed, 34 insertions(+), 14 deletions(-)

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