Merge branch 'master' into events/33c3

1 files changed, 0 insertions, 13 deletions

diff --git a/view/schedule-json.php b/view/schedule-json.php
deleted file mode 100644
index 9aea603..0000000
--- a/view/schedule-json.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-$schedule = new Schedule();
-if(!$schedule->isEnabled())
-	throw new NotFoundException('Schedule is disabled');
-
-header('Content-Type: application/json');
-
-if($conference->isClosed())
-	echo '{}';
-
-else
-	echo json_encode($schedule->getSchedule(), JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE);