Michael Gapczynski 82d81e8d39 Merge branch 'share_api' ... Conflicts: apps/contacts/lib/vcard.php apps/files/index.php lib/files.php		2012-08-19 22:29:01 -04:00
..
app.php	Merge branch 'master' into share_api	2012-08-09 11:38:22 -04:00
database.xml	fix merge conflicts	2012-06-13 11:40:00 +02:00
info.xml	mark the apps as part of the shipped package and increase the requirement to ownCloud 4	2012-05-18 16:06:57 +02:00
remote.php	Disable user enumeration	2012-08-14 17:23:26 +02:00
update.php	change some function names in OC_Calendar_Repeat	2012-06-15 11:34:21 +02:00
version	fix remote and public.php	2012-07-13 22:44:35 +02:00