[Pkg-owncloud-commits] [owncloud-doc] 21/38: Merge pull request #619 from owncloud/encryption-user

[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 48e2ffcf9c0cfed6d731bb497a518b3934c682bf
Merge: 4893d07 a057b2a
Author: Carla Schroder <carla at owncloud.com>
Date:   Mon Oct 20 13:45:28 2014 -0700

    Merge pull request #619 from owncloud/encryption-user
    
    Rewrite of Encryption page in user manual

 user_manual/files/encryption.rst   | 134 +++++++++++++++++++++++++++----------
 user_manual/images/encryption1.png | Bin 0 -> 4095 bytes
 user_manual/images/encryption2.png | Bin 0 -> 8914 bytes
 user_manual/images/encryption3.png | Bin 0 -> 14219 bytes
 user_manual/images/encryption4.png | Bin 0 -> 18907 bytes
 5 files changed, 98 insertions(+), 36 deletions(-)

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