Merge branch 'saas' into saas-media-refactor

Conflicts: airtime_mvc/application/cloud_storage/ProxyStorageBackend.php airtime_mvc/application/controllers/ApiController.php
2015-02-25 13:02:11 -05:00 · 2015-02-25 13:02:11 -05:00 · 3a1141d4c8
commit 3a1141d4c8
parent c0db309e32 68948e3bb5
42 changed files with 9042 additions and 145 deletions
--- a/airtime_mvc/application/common/FileDataHelper.php
+++ b/airtime_mvc/application/common/FileDataHelper.php
@ -24,5 +24,4 @@ class FileDataHelper {
            $data["bpm"] = intval($data["bpm"]);
        }
    }
-
 }