[Pkg-owncloud-commits] [owncloud] 33/85: Merge pull request #8850 from owncloud/stable6_backport_8607

[David Prévot]

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

taffit pushed a commit to branch 6.0
in repository owncloud.

commit e5dcec75bac90fd8d8dde669708408f0f9a5992b
Merge: 58b6b89 a908e28
Author: Thomas Müller <thomas.mueller at tmit.eu>
Date:   Wed Jun 4 09:34:39 2014 +0200

    Merge pull request #8850 from owncloud/stable6_backport_8607
    
    [backport] [stable6] Skip filescan but execute hooks

 config/config.sample.php            |  3 +++
 lib/private/files/cache/scanner.php | 50 +++++++++++++++++++++++++++++++------
 2 files changed, 45 insertions(+), 8 deletions(-)

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