Merged 2.5.x into saas

2014-11-05 17:36:58 -05:00 · 2014-11-05 17:36:58 -05:00 · 4d263ce897
commit 4d263ce897
parent bd68ae4f98 3046003a1b
26 changed files with 2618 additions and 1649 deletions
--- a/airtime_mvc/application/controllers/LocaleController.php
+++ b/airtime_mvc/application/controllers/LocaleController.php
@ -6,7 +6,7 @@ class LocaleController extends Zend_Controller_Action
    public function init()
    {
    }
-
+    
    public function datatablesTranslationTableAction()
    {
        $this->view->layout()->disableLayout();