server/settings
Bart Visscher 21a88613a1 Merge branch 'lostpassword'
Conflicts:
	core/templates/login.php
	index.php
	lib/util.php
2011-09-30 23:48:20 +02:00
..
ajax Merge branch 'lostpassword' 2011-09-30 23:48:20 +02:00
appinfo merged admin, help and settings to settings 2011-08-13 05:13:34 +02:00
css quota good cleand up 2011-09-30 19:47:48 +02:00
img added icon for Admin 2011-08-23 11:37:29 +02:00
js Add email field to personal preferences 2011-09-26 21:17:26 +02:00
l10n updated translations 2011-09-23 19:08:02 +02:00
templates Merge branch 'lostpassword' 2011-09-30 23:48:20 +02:00
admin.php Move some common code to OC_Util 2011-09-18 21:31:56 +02:00
apps.php dissable app instalation from apps.owncloud.org interface 2011-09-28 22:39:41 +02:00
help.php Move some common code to OC_Util 2011-09-18 21:31:56 +02:00
languageCodes.php updated translations 2011-09-23 19:08:02 +02:00
personal.php Add email field to personal preferences 2011-09-26 21:17:26 +02:00
settings.php Move some common code to OC_Util 2011-09-18 21:31:56 +02:00
users.php fix creating users 2011-09-25 15:58:10 +02:00