Michael Gapczynski 05389827fd Merge branch 'master' into sharing ... Conflicts: .gitignore lib/base.php		2011-07-04 16:36:30 -04:00
..
files_imageviewer	fix loading of image viewer again	2011-06-04 23:14:33 +02:00
files_publiclink	add oc_user::getUser to get the user id of the loggedin user	2011-06-22 12:50:57 +02:00
files_sharing	Append LIMIT 1 to getSource queries to improve performance	2011-07-03 11:43:49 -04:00
user_ldap	Hopefully fix errors if ldap plugin is not configured	2011-07-04 19:05:14 +02:00
user_openid	you can now use your owncloud url as openid provider	2011-06-24 22:09:55 +02:00
.gitkeep	apps are now stored in /apps	2011-04-16 09:46:58 +02:00