Bart Visscher 21a88613a1 Merge branch 'lostpassword' ... Conflicts: core/templates/login.php index.php lib/util.php		2011-09-30 23:48:20 +02:00
..
admin.php	allow apps to register form for the settings and admin pages	2011-08-23 01:41:18 +02:00
apps.php	dont set content type to json for Apps	2011-09-26 00:19:34 +02:00
help.php	allow apps to register form for the settings and admin pages	2011-08-23 01:41:18 +02:00
personal.php	Merge branch 'lostpassword'	2011-09-30 23:48:20 +02:00
settings.php	allow apps to register form for the settings and admin pages	2011-08-23 01:41:18 +02:00
users.php	user list has descriptions now	2011-09-30 19:35:25 +02:00