[Pkg-owncloud-commits] [owncloud-doc] 04/05: Merge pull request #196 from owncloud/enc_update

[David Prévot]

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

taffit pushed a commit to branch dfsg_clean
in repository owncloud-doc.

commit 413ca07c434042f503d716126f39334b4177bfba
Merge: 187ca05 99d771c
Author: Vincent Petry <pvince81 at owncloud.com>
Date:   Fri Dec 6 06:47:50 2013 -0800

    Merge pull request #196 from owncloud/enc_update
    
    updated documentation of OC6: we now encrypt versions during the initial...

 user_manual/files/encryption.rst | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

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