diff options
| author | Bart Visscher <bartv@thisnet.nl> | 2012-05-03 23:18:43 +0200 |
|---|---|---|
| committer | Bart Visscher <bartv@thisnet.nl> | 2012-05-03 23:18:43 +0200 |
| commit | 077ea94f713773fe2cdc0a07bf2d8bc0977b6942 (patch) | |
| tree | 02182bf62c3ede356d88c62c98fd3754c9bb05ca /apps/calendar/ajax/events.php | |
| parent | b62a8ba0f899cd882938c9d3832ed1d35f102ae5 (diff) | |
| parent | 62da0bae432485d1fdec8c09ef96580332d2d43b (diff) | |
| download | nextcloud-server-077ea94f713773fe2cdc0a07bf2d8bc0977b6942.tar.gz nextcloud-server-077ea94f713773fe2cdc0a07bf2d8bc0977b6942.zip | |
Merge commit 'refs/merge-requests/89' of git://gitorious.org/owncloud/owncloud
Conflicts:
apps/calendar/ajax/events.php
Diffstat (limited to 'apps/calendar/ajax/events.php')
| -rwxr-xr-x | apps/calendar/ajax/events.php | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/apps/calendar/ajax/events.php b/apps/calendar/ajax/events.php index 2499c5163a2..b84f5b4c608 100755 --- a/apps/calendar/ajax/events.php +++ b/apps/calendar/ajax/events.php @@ -22,4 +22,3 @@ foreach($events as $event){ $output[] = OC_Calendar_App::generateEventOutput($event, $start, $end); } OCP\JSON::encodedPrint($output); -?> |