Jakob Sack 2bfad189e7 Merge branch 'master' of git://anongit.kde.org/owncloud into autoload ... Conflicts: lib/base.php lib/filestorage.php		2011-07-29 20:42:24 +02:00
..
ajax	add oc_user::getUser to get the user id of the loggedin user	2011-06-22 12:50:57 +02:00
appinfo	remove dummy settings	2011-07-28 21:05:49 +02:00
css	forgot to commit css for user management	2011-07-20 20:27:06 +02:00
img	even shinier icons	2011-04-18 11:23:47 +02:00
js	Some ui work on user management, but it can still use a lot of improvement.	2011-07-20 15:51:19 +02:00
l10n	More nl l10n improvements	2011-07-04 00:39:04 +02:00
templates	Some ui work on user management, but it can still use a lot of improvement.	2011-07-20 15:51:19 +02:00
apps.php	Delete requires in applications where possible	2011-07-27 19:25:49 +02:00
system.php	Delete requires in applications where possible	2011-07-27 19:25:49 +02:00
users.php	Delete requires in applications where possible	2011-07-27 19:25:49 +02:00