Michael Gapczynski 78cd1153f0 Merge branch 'master' into share_api ... Conflicts: apps/contacts/lib/vcard.php apps/files_sharing/sharedstorage.php		2012-08-09 11:38:22 -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	Implemented Sabre iCalendar Export Plugin.	2012-07-08 16:58:17 +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