[Pkg-owncloud-commits] [owncloud] 32/83: Merge pull request #5934 from owncloud/stable5-excludeextstoragefromquota

[David Prévot]

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

taffit pushed a commit to branch 5.0
in repository owncloud.

commit 880769976bbc8c75186c89268c78bc40efb80998
Merge: 2565a94 5e6ea15
Author: Vincent Petry <pvince81 at owncloud.com>
Date:   Fri Nov 22 08:34:58 2013 -0800

    Merge pull request #5934 from owncloud/stable5-excludeextstoragefromquota
    
    [Stable5] Exclude ext storage from quota

 apps/files/ajax/getstoragestats.php | 8 +++++++-
 apps/files/js/files.js              | 3 ++-
 lib/fileproxy/quota.php             | 7 ++++++-
 lib/files.php                       | 4 ++--
 lib/files/filesystem.php            | 6 ++++--
 lib/files/view.php                  | 6 ++++--
 lib/helper.php                      | 3 ++-
 tests/lib/files/view.php            | 5 +++++
 8 files changed, 32 insertions(+), 10 deletions(-)


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