[Pkg-owncloud-commits] [owncloud-doc] 263/270: Merge pull request #442 from owncloud/code-of-conduct

[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 741238ef6f47be6109115d84a1a69494980e2a40
Merge: c117b9b f442e0f
Author: Thomas Müller <thomas.mueller at tmit.eu>
Date:   Mon Jul 28 17:06:07 2014 +0200

    Merge pull request #442 from owncloud/code-of-conduct
    
    bring back the Code of Conduct

 developer_manual/general/code-of-conduct.rst | 86 ++++++++++++++++++++++++++++
 developer_manual/general/index.rst           |  1 +
 2 files changed, 87 insertions(+)

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