[Pkg-owncloud-commits] [owncloud-doc] 19/38: Merge pull request #616 from owncloud/encryption

[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 4893d073a740a119976697d5e4f4262d5dddf053
Merge: b5a6ad0 2175ab0
Author: Carla Schroder <carla at owncloud.com>
Date:   Mon Oct 20 12:51:27 2014 -0700

    Merge pull request #616 from owncloud/encryption
    
    Rewrite admin Encryption manual page

 .../configuration/configuration_encryption.rst     | 197 ++++++++++++++-------
 admin_manual/images/encryption1.png                | Bin 0 -> 15491 bytes
 admin_manual/images/encryption2.png                | Bin 0 -> 4095 bytes
 admin_manual/images/encryption3.png                | Bin 0 -> 9018 bytes
 admin_manual/images/encryption4.png                | Bin 0 -> 4498 bytes
 admin_manual/images/encryption5.png                | Bin 0 -> 18907 bytes
 admin_manual/images/encryption6.png                | Bin 0 -> 14219 bytes
 admin_manual/images/encryption7.png                | Bin 0 -> 12526 bytes
 admin_manual/images/encryption8.png                | Bin 0 -> 15038 bytes
 admin_manual/images/encryption9.png                | Bin 0 -> 12567 bytes
 admin_manual/images/encryption_enabling.png        | Bin 30317 -> 0 bytes
 11 files changed, 130 insertions(+), 67 deletions(-)

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