[Pkg-owncloud-commits] [owncloud-doc] 202/227: Merge branch 'oc-document' of https://github.com/owncloud/documentation into oc-document

[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 974b4a0401317e358279d29b887d8eba35eeee5f
Merge: 59ebdf4 d8eeec5
Author: Carla Schroder <carla at owncloud.com>
Date:   Thu Oct 2 12:16:59 2014 -0700

    Merge branch 'oc-document' of https://github.com/owncloud/documentation into oc-document
    
    Conflicts:
    	admin_manual/configuration/configuring_documents.rst

 admin_manual/configuration/configuring_documents.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --cc admin_manual/configuration/configuring_documents.rst
index b28dbe4,5d8e807..c182dd1
--- a/admin_manual/configuration/configuring_documents.rst
+++ b/admin_manual/configuration/configuring_documents.rst
@@@ -23,6 -22,3 +23,6 @@@ to grant access to the Documents apps t
  available to all groups.
  
  .. image:: ../images/documents_app_enable.png
 +
 +See 'Collaborative Document Editing" in the User manual to learn how to create 
- and share documents in the Documents application.
++and share documents in the Documents application.

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