server/apps/calendar/ajax
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
..
calendar ported oc_json 2012-05-03 12:23:29 +02:00
categories ported oc_json 2012-05-03 12:23:29 +02:00
event ported oc_json 2012-05-03 12:23:29 +02:00
import ported oc_json 2012-05-03 12:23:29 +02:00
settings ported oc_json 2012-05-03 12:23:29 +02:00
share ported oc_json 2012-05-03 12:23:29 +02:00
changeview.php ported oc_json 2012-05-03 12:23:29 +02:00
events.php Merge commit 'refs/merge-requests/89' of git://gitorious.org/owncloud/owncloud 2012-05-03 23:18:43 +02:00