Merge branch 'releases' into hotfixes

1 files changed, 6 insertions, 3 deletions

diff --git a/app/controllers/javascriptController.php b/app/controllers/javascriptController.php
index 8060f560c..071cf65a4 100755
--- a/app/controllers/javascriptController.php
+++ b/app/controllers/javascriptController.php
@@ -5,8 +5,11 @@ class javascriptController extends ActionController {
 		$this->view->_useLayout (false);
 		header('Content-type: text/javascript');
 	}
-	
-	public function mainAction () {
-	
+
+	public function mainAction () {}
+
+	public function actualizeAction () {
+		$feedDAO = new FeedDAO ();
+		$this->view->feeds = $feedDAO->listFeeds ();
 	}
 }