Georg Ehrke 0918fc7d91 fix merge conflicts		2012-04-21 23:21:50 +02:00
..
alarm.php	make shared events editable and add (empty) classes for alarm and attendees	2012-04-10 16:03:38 -04:00
app.php	fix merge conflicts	2012-04-15 12:43:07 +02:00
attendees.php	make shared events editable and add (empty) classes for alarm and attendees	2012-04-10 16:03:38 -04:00
calendar.php	Calendar: Document active parameter in allCalendars	2012-04-13 21:13:58 +02:00
connector_sabre.php	remove 'description' from OC_Connector_Sabre_CalDAV propertyMap	2011-10-12 15:10:59 +11:00
hooks.php	Remove useless, unmaintained dav.php	2012-04-15 16:50:44 +02:00
object.php	fix merge conflicts	2012-04-21 23:21:50 +02:00
search.php	Merge branch 'master' into sabredav_1.6	2012-04-15 22:28:11 +02:00
share.php	implement shared calendar activation on server side	2012-04-18 11:50:12 +02:00