[Pkg-owncloud-commits] [owncloud-doc] 261/270: Merge pull request #447 from jospoortvliet/master

[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 5fc35392e4e1e68e10226ef799f102b0021498f4
Merge: 0e26dcf 190c317
Author: Morris Jobke <hey at morrisjobke.de>
Date:   Mon Jul 28 15:17:17 2014 +0200

    Merge pull request #447 from jospoortvliet/master
    
    Update codingguidelines.rst

 developer_manual/general/codingguidelines.rst | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

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