merge from dev

2015-12-14 10:43:03 -05:00
parent 1c8f02ce0f
commit 33b01d778c
911 changed files with 34157 additions and 57125 deletions
@@ -38,7 +38,7 @@

        Dashboard.showLoadingMsg();

-        ApiClient.getStudios(Dashboard.getCurrentUserId(), query).done(function (result) {
+        ApiClient.getStudios(Dashboard.getCurrentUserId(), query).then(function (result) {

            // Scroll back up so they can see the results from the beginning
            window.scrollTo(0, 0);