Merge branch 'master' into hotfixes

1 files changed, 0 insertions, 15 deletions

diff --git a/app/controllers/javascriptController.php b/app/controllers/javascriptController.php
deleted file mode 100755
index 071cf65a4..000000000
--- a/app/controllers/javascriptController.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-class javascriptController extends ActionController {
-	public function firstAction () {
-		$this->view->_useLayout (false);
-		header('Content-type: text/javascript');
-	}
-
-	public function mainAction () {}
-
-	public function actualizeAction () {
-		$feedDAO = new FeedDAO ();
-		$this->view->feeds = $feedDAO->listFeeds ();
-	}
-}