[Pkg-owncloud-commits] [owncloud-doc] 14/71: Merge pull request #655 from owncloud/encryptionfix

[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 133f96a0c0c2fa13a78fdd8285dcc68567a4f8f1
Merge: 6c111c7 d5bb2ff
Author: Carla Schroder <carla at owncloud.com>
Date:   Tue Nov 18 12:18:12 2014 -0800

    Merge pull request #655 from owncloud/encryptionfix
    
    Add section for windows servers

 ...nfiguration.rst => encryption_configuration.rst} | 21 +++++++++++++++++++--
 admin_manual/configuration/index.rst                |  2 +-
 2 files changed, 20 insertions(+), 3 deletions(-)

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