[Pkg-owncloud-commits] [owncloud-doc] 22/110: Merge pull request #717 from owncloud/resetpass

[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 2502b8d84379622ed32d8200dbe7c51f10b4db34
Merge: e95f13d 6e6d45d
Author: Carla Schroder <carla at owncloud.com>
Date:   Tue Dec 16 16:40:07 2014 -0800

    Merge pull request #717 from owncloud/resetpass
    
    Howto reset passwords with occ

 admin_manual/configuration/index.rst               |  3 +-
 .../configuration/reset_admin_password.rst         | 33 ++++++++++++++++++++++
 admin_manual/index.rst                             |  1 +
 3 files changed, 36 insertions(+), 1 deletion(-)

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