Georg Ehrke bfb67286c8 fix merge conflicts		2012-02-25 16:54:27 +01:00
..
app.php	fix merge conflicts	2012-02-25 16:54:27 +01:00
calendar.php	Calendar: Correct calendarcolor format for ical color property	2012-02-21 20:10:40 +01:00
connector_sabre.php	remove 'description' from OC_Connector_Sabre_CalDAV propertyMap	2011-10-12 15:10:59 +11:00
hooks.php	Change copyright notice to short form	2011-09-23 22:59:54 +02:00
object.php	fix merge conflicts	2012-02-25 16:54:27 +01:00
search.php	Fixup use of OC_Helper::linkTo function	2012-02-17 22:07:14 +01:00
share.php	add is_editing_allowed function to OC_Calendar_Share	2012-02-22 10:41:16 +01:00