diff options
| author | Georg Ehrke <dev@georgswebsite.de> | 2012-03-29 23:20:03 +0200 |
|---|---|---|
| committer | Georg Ehrke <dev@georgswebsite.de> | 2012-03-29 23:20:03 +0200 |
| commit | 90286353e24738006128b1801c55483d2103e6ae (patch) | |
| tree | 869ece50a1b45b6d99d399890743e2cfb3c78d22 /apps/calendar/ajax | |
| parent | 536a3ecb428b9450a188de4a0fcca2f9be6318f3 (diff) | |
| parent | f74d11c0c3c4a3bcd733499edd63f8e31389a3a3 (diff) | |
| download | nextcloud-server-90286353e24738006128b1801c55483d2103e6ae.tar.gz nextcloud-server-90286353e24738006128b1801c55483d2103e6ae.zip | |
Merge branch 'master' into sabredav_1.6
Diffstat (limited to 'apps/calendar/ajax')
| -rw-r--r-- | apps/calendar/ajax/import/import.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/calendar/ajax/import/import.php b/apps/calendar/ajax/import/import.php index c0797f6e425..d0bdab4f0d5 100644 --- a/apps/calendar/ajax/import/import.php +++ b/apps/calendar/ajax/import/import.php @@ -10,7 +10,7 @@ ob_start(); require_once('../../../../lib/base.php'); OC_JSON::checkLoggedIn(); OC_Util::checkAppEnabled('calendar'); -$nl = "\n"; +$nl = "\n\r"; $progressfile = OC::$APPSROOT . '/apps/calendar/import_tmp/' . md5(session_id()) . '.txt'; if(is_writable('import_tmp/')){ $progressfopen = fopen($progressfile, 'w'); |