merge from dev

2015-12-14 10:43:03 -05:00 · 2015-12-14 10:43:03 -05:00 · 33b01d778c
commit 33b01d778c
parent 1c8f02ce0f
911 changed files with 34157 additions and 57125 deletions
--- a/dashboard-ui/scripts/queryfilters.js
+++ b/dashboard-ui/scripts/queryfilters.js
@ -138,7 +138,7 @@
            IncludeItemTypes: itemQuery.IncludeItemTypes


-        })).done(function (result) {
+        })).then(function (result) {

            renderFilters(page, result);