]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'master' into rename-lostpassword-controller
authorThomas Müller <thomas.mueller@tmit.eu>
Wed, 4 Sep 2013 18:46:32 +0000 (20:46 +0200)
committerThomas Müller <thomas.mueller@tmit.eu>
Wed, 4 Sep 2013 18:46:32 +0000 (20:46 +0200)
commite43e8b0db8d1c9935ac49d37255e934e310798c7
treed228f608b83e1c04ef5b97b0fe4b0a15282343b7
parent5539b9e843dbd4125ba9bbb3de79d47ef48e059b
parent09187f3b3b30e6f810c6afff7332615ed472154e
Merge branch 'master' into rename-lostpassword-controller

Conflicts:
core/lostpassword/controller.php
core/lostpassword/controller.php