aboutsummaryrefslogtreecommitdiffstats
path: root/apps/calendar/export.php
diff options
context:
space:
mode:
authorGeorg Ehrke <dev@georgswebsite.de>2012-03-29 23:20:03 +0200
committerGeorg Ehrke <dev@georgswebsite.de>2012-03-29 23:20:03 +0200
commit90286353e24738006128b1801c55483d2103e6ae (patch)
tree869ece50a1b45b6d99d399890743e2cfb3c78d22 /apps/calendar/export.php
parent536a3ecb428b9450a188de4a0fcca2f9be6318f3 (diff)
parentf74d11c0c3c4a3bcd733499edd63f8e31389a3a3 (diff)
downloadnextcloud-server-90286353e24738006128b1801c55483d2103e6ae.tar.gz
nextcloud-server-90286353e24738006128b1801c55483d2103e6ae.zip
Merge branch 'master' into sabredav_1.6
Diffstat (limited to 'apps/calendar/export.php')
-rw-r--r--apps/calendar/export.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/calendar/export.php b/apps/calendar/export.php
index 9886ad8e8cc..2736eec96c2 100644
--- a/apps/calendar/export.php
+++ b/apps/calendar/export.php
@@ -11,7 +11,7 @@ OC_Util::checkLoggedIn();
OC_Util::checkAppEnabled('calendar');
$cal = isset($_GET['calid']) ? $_GET['calid'] : NULL;
$event = isset($_GET['eventid']) ? $_GET['eventid'] : NULL;
-$nl = "\n";
+$nl = "\n\r";
if(isset($cal)){
$calendar = OC_Calendar_App::getCalendar($cal);
$calobjects = OC_Calendar_Object::all($cal);