]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'lostpassword'
authorBart Visscher <bartv@thisnet.nl>
Fri, 30 Sep 2011 21:48:20 +0000 (23:48 +0200)
committerBart Visscher <bartv@thisnet.nl>
Fri, 30 Sep 2011 21:48:20 +0000 (23:48 +0200)
commit21a88613a150c550e32d63df9a9ef8bf3d5107d0
tree45e76fbae9349265489dbebe5aef090f45e49a85
parentddd28aae67d7e67b7e39c1fe58fe52659d1dd755
parent5fbf378d1021da91977caa6c7df9944c353d4786
Merge branch 'lostpassword'

Conflicts:
core/templates/login.php
index.php
lib/util.php
core/templates/login.php
index.php
lib/util.php
settings/templates/personal.php