[Pkg-owncloud-commits] [owncloud-doc] 06/71: Merge branch 'marcdexet-cnrs-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 0ab12c6be604d5c602282126d683891b6739700a
Merge: 3b5526b 658cbed
Author: Morris Jobke <hey at morrisjobke.de>
Date:   Fri Nov 14 14:50:27 2014 +0100

    Merge branch 'marcdexet-cnrs-master'

 developer_manual/app/routes.rst | 8 ++++++++
 1 file changed, 8 insertions(+)

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