Thomas Müller e43e8b0db8 Merge branch 'master' into rename-lostpassword-controller ... Conflicts: core/lostpassword/controller.php		2013-09-04 20:46:32 +02:00
..
templates	Add _many_ newlines at the end of files	2013-08-18 11:06:59 +02:00
controller.php	Merge branch 'master' into rename-lostpassword-controller	2013-09-04 20:46:32 +02:00