[Pkg-owncloud-commits] [owncloud-doc] 18/18: Merge branch 'upstream' into dfsg_clean

[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 e23f2ed6d382257e57b2af1ff6d69e78b745680f
Merge: 4e70eeb a4ded78
Author: David Prévot <taffit at debian.org>
Date:   Wed Nov 20 16:09:21 2013 -0400

    Merge branch 'upstream' into dfsg_clean

 admin_manual/maintenance/backup.rst                |   20 +-
 admin_manual/maintenance/index.rst                 |    6 +-
 admin_manual/maintenance/migrating.rst             |   14 +-
 admin_manual/maintenance/restore.rst               |   39 ++
 admin_manual/maintenance/update.rst                |   65 +--
 developer_manual/app/app/api/index.rst             |    1 -
 developer_manual/app/app/api/provisioning_api.rst  |  601 --------------------
 developer_manual/core/ocs-share-api.rst            |    2 +-
 user_manual/contents.rst                           |    3 +-
 user_manual/external_storage/google_drive.rst      |   61 ++
 user_manual/files/index.rst                        |    2 +
 user_manual/files/quota.rst                        |   83 +++
 .../images/external_google_drive_1_sign_in.png     |  Bin 0 -> 26480 bytes
 .../images/external_google_drive_2_verify.png      |  Bin 0 -> 15526 bytes
 .../external_google_drive_3_create_project.png     |  Bin 0 -> 8244 bytes
 .../images/external_google_drive_4_enable_api.png  |  Bin 0 -> 9818 bytes
 .../external_google_drive_5_setup_ownCloud.png     |  Bin 0 -> 2820 bytes
 .../images/external_google_drive_6_accept.png      |  Bin 0 -> 12736 bytes
 user_manual/images/mediaplayer.png                 |  Bin 61649 -> 0 bytes
 user_manual/index.rst                              |   13 +-
 user_manual/mediaplayer.rst                        |   27 -
 21 files changed, 234 insertions(+), 703 deletions(-)

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