[Pkg-owncloud-commits] [owncloud-doc] 11/13: Merge pull request #190 from owncloud/fix-all

[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 5fe2c70b6c4ed18db67c854449d17e96fe873d7c
Merge: d20a0bd 714e25b
Author: Thomas Müller <thomas.mueller at tmit.eu>
Date:   Mon Nov 25 01:08:33 2013 -0800

    Merge pull request #190 from owncloud/fix-all
    
    merge @j-ed's version and fix layout

 .../configuration/custom_mount_config_gui.rst      |  13 +---
 .../custom_mount_config_gui_google_drive.rst       |  73 ---------------------
 .../custom_mount_config_gui_add_google_drive-1.png | Bin 26480 -> 0 bytes
 .../custom_mount_config_gui_add_google_drive-2.png | Bin 15526 -> 0 bytes
 .../custom_mount_config_gui_add_google_drive-3.png | Bin 8244 -> 0 bytes
 .../custom_mount_config_gui_add_google_drive-4.png | Bin 9818 -> 0 bytes
 .../custom_mount_config_gui_add_google_drive-5.png | Bin 2820 -> 0 bytes
 .../custom_mount_config_gui_add_google_drive-6.png | Bin 12736 -> 0 bytes
 admin_manual/maintenance/backup.rst                |  16 +++--
 admin_manual/maintenance/restore.rst               |  16 +++--
 user_manual/contents.rst                           |   1 -
 user_manual/external_storage/google_drive.rst      |  49 +++++++-------
 12 files changed, 46 insertions(+), 122 deletions(-)

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