[Pkg-owncloud-commits] [owncloud-doc] 06/09: Merge pull request #346 from samwilson/patch-1

[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 0d52fd0a955b4ca3f40ca78fa1a17f1fe85072a2
Merge: 4daac4f 9e8dd8a
Author: Morris Jobke <hey at morrisjobke.de>
Date:   Tue May 13 10:45:32 2014 +0200

    Merge pull request #346 from samwilson/patch-1
    
    Update database.rst

 developer_manual/app/appframework/database.rst | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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