Bart Visscher 077ea94f71 Merge commit 'refs/merge-requests/89' of git://gitorious.org/owncloud/owncloud ... Conflicts: apps/calendar/ajax/events.php		2012-05-03 23:18:43 +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	Merge commit 'refs/merge-requests/89' of git://gitorious.org/owncloud/owncloud	2012-05-03 23:18:43 +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	ported oc_db	2012-05-03 13:06:08 +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	ported oc_db	2012-05-03 13:06:08 +02:00
search.php	port oc_preferences	2012-05-02 15:54:34 +02:00
share.php	ported oc_db	2012-05-03 13:06:08 +02:00