Merge pull request #301 from DavidZey/master

revert jquery upgrade - needs more testing
theVolary · Jan 13, 2015 · a00ff5e · a00ff5e
2 parents f8f6a90 + 7241883
commit a00ff5e
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/lib/resource-packager.js b/lib/resource-packager.js
@@ -253,8 +253,7 @@ exports.packageFrameworkResources = function(options, callback) {
       {path: "/feather-client/lib/underscore.js", prefix: prefix},
       options.appOptions["socket.io"].enabled ? {path: "/socket.io/socket.io.js", prefix: prefix, virtual: true} : null, //virtual skips built-in minify
       {path: "/feather-client/lib/json2.js", prefix: prefix},
-      {path: "//code.jquery.com/jquery-1.11.2.min.js", prefix: prefix, virtual: true}, //virtual skips built-in minify
-      {path: "//code.jquery.com/jquery-migrate-1.2.1.min.js", prefix: prefix, virtual: true}, //virtual skips built-in minify
+      {path: "//code.jquery.com/jquery-1.7.1.min.js", prefix: prefix, virtual: true}, //virtual skips built-in minify
       {path: "/feather-client/lib/jquery.tmpl.js", prefix: prefix},
       {path: "/feather-client/lib/jquery.cookie.js", prefix: prefix},
       {path: "/feather-client/lib/inherits.js", prefix: prefix},