[Pkg-owncloud-commits] [owncloud-doc] 12/22: Merge pull request #360 from aykit/stable6

[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 82e906a8a0d28ee12f829ea9c85e2ec6fe3521c4
Merge: 631ab14 5a3e8da
Author: Volkan Gezer <wakeup at users.noreply.github.com>
Date:   Fri May 30 21:40:46 2014 +0200

    Merge pull request #360 from aykit/stable6
    
    Changed configuring_big_file_upload.rst to reflect .htaccess, ...

 .../configuration/configuring_big_file_upload.rst     | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

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