[Pkg-owncloud-commits] [owncloud-doc] 20/22: Merge remote-tracking branch 'upstream/stable6' into upstream

[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 00177f20afea269831a6b2956d32a0dfb589f13a
Merge: 05ea83c b925820
Author: David Prévot <taffit at debian.org>
Date:   Sat May 31 21:09:27 2014 -0400

    Merge remote-tracking branch 'upstream/stable6' into upstream

 .../themes/owncloud_com/static/less/reset.less     |  2 +-
 admin_manual/config/code_locations.rst             |  2 +-
 .../configuration/configuring_big_file_upload.rst  | 24 +++++++++++++++++-----
 admin_manual/installation/installation_linux.rst   |  5 +++++
 admin_manual/installation/installation_source.rst  |  6 ++++--
 admin_manual/maintenance/update.rst                |  2 +-
 developer_manual/devenv/index.rst                  |  6 +++---
 developer_manual/ios_library/examples.rst          |  4 ++--
 8 files changed, 36 insertions(+), 15 deletions(-)

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