[Pkg-owncloud-commits] [owncloud-doc] 20/49: Merge pull request #222 from wakeup/stable6

[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 7f34df7786000148cdd2cc1c1d61382a3a6f97a7
Merge: 97f89e1 5d87654
Author: Thomas Müller <thomas.mueller at tmit.eu>
Date:   Sun Jan 5 03:47:58 2014 -0800

    Merge pull request #222 from wakeup/stable6
    
    Add user_management and update app configuration pages

 admin_manual/configuration/configuration_apps.rst  |  18 +-
 admin_manual/configuration/configuration_users.rst | 224 +++++++++++++++++++++
 admin_manual/configuration/index.rst               |   3 +-
 admin_manual/images/oc_admin_app_page.png          | Bin 0 -> 28370 bytes
 admin_manual/images/oc_admin_user_manage.png       | Bin 0 -> 21025 bytes
 admin_manual/index.rst                             |   3 +-
 admin_manual/maintenance/backup.rst                |   2 +-
 user_manual/files/filesweb.rst                     |  31 ++-
 user_manual/images/oc_filesweb_navigate.png        | Bin 0 -> 5159 bytes
 user_manual/images/oc_filesweb_new.png             | Bin 0 -> 5434 bytes
 user_manual/webinterface.rst                       |   3 +-
 11 files changed, 277 insertions(+), 7 deletions(-)

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