Georg Ehrke 19c101a660 fix merge conflicts		2012-03-25 14:02:02 +02:00
..
app.php	fix merge conflicts	2012-03-25 14:02:02 +02:00
calendar.php	Small cleanups	2012-03-01 21:00:23 +01:00
connector_sabre.php	remove 'description' from OC_Connector_Sabre_CalDAV propertyMap	2011-10-12 15:10:59 +11:00
hooks.php	Add /dav.php, a single location bundling all *DAV-operations.	2012-03-02 20:25:20 +01:00
object.php	Merge branch 'master' into calendar_sharing	2012-03-16 12:17:58 +01:00
search.php	Search: Change provider registration to class name, for lazy loading of search providers	2012-03-01 22:59:35 +01:00
share.php	add is_editing_allowed function to OC_Calendar_Share	2012-02-22 10:41:16 +01:00