Merge branch '2.3.x' into 2.3.x-saas

Conflicts: airtime_mvc/application/controllers/PreferenceController.php
2013-02-04 16:22:35 -05:00 · 2013-02-04 16:22:35 -05:00 · c398ce930b
commit c398ce930b
parent 0ea7cca966 e2472f1f5d
17 changed files with 190 additions and 117 deletions
--- a/airtime_mvc/application/controllers/PreferenceController.php
+++ b/airtime_mvc/application/controllers/PreferenceController.php
@ -116,7 +116,6 @@ class PreferenceController extends Zend_Controller_Action

    public function directoryConfigAction()
    {
-
    }

    public function streamSettingAction()