Michael Gapczynski 11d1627513 Merge branch 'master' into sharing. Integrate with changes in master, rename classes ... Conflicts: lib/base.php		2011-07-30 19:40:19 -04:00
..
files_imageviewer	Renaming classes :-)	2011-07-29 21:36:03 +02:00
files_publiclink	Renaming classes :-)	2011-07-29 21:36:03 +02:00
files_sharing	Merge branch 'master' into sharing. Integrate with changes in master, rename classes	2011-07-30 19:40:19 -04:00
media	Icewind destroyed my changes :-(	2011-07-30 08:56:08 +02:00
user_ldap	Renaming classes :-)	2011-07-29 21:36:03 +02:00
user_openid	Renaming classes :-)	2011-07-29 21:36:03 +02:00
.gitkeep	apps are now stored in /apps	2011-04-16 09:46:58 +02:00