[Pkg-owncloud-commits] [owncloud-doc] 20/28: Merge pull request #612 from owncloud/quota

[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-doc.

commit e2266218aa6da5506a532c3af6932dc228089ace
Merge: 988e915 692f62b
Author: Carla Schroder <carla at owncloud.com>
Date:   Wed Oct 15 19:05:07 2014 -0700

    Merge pull request #612 from owncloud/quota
    
    Expanded quota section, referenced encryption page for password resets, ...

 admin_manual/configuration/configuration_users.rst | 35 +++++++++++++++++-----
 1 file changed, 27 insertions(+), 8 deletions(-)

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