Skip to content

Commit

Permalink
Merge pull request #286 from skrenek/master
Browse files Browse the repository at this point in the history
Moved jquery CDN pull to version 1.7.1 to match what was served locally ...
  • Loading branch information
skrenek committed Jun 13, 2014
2 parents 69e2dfa + 2a0d930 commit 8427958
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion lib/resource-packager.js
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ exports.packageFrameworkResources = function(options, callback) {
options.appOptions["socket.io"].enabled ? {path: "/socket.io/socket.io.js", prefix: prefix, virtual: true} : null,
{path: "/feather-client/lib/json2.js", prefix: prefix, minifyAllowed: false},
//{path: "/feather-client/lib/jquery-1.7.min.js", prefix: prefix},
{path: "https://code.jquery.com/jquery-1.7.2.min.js", prefix: prefix, virtual: true},
{path: "https://code.jquery.com/jquery-1.7.1.min.js", prefix: prefix, virtual: true},
// {path: "/feather-client/lib/jquery-1.9.migrate.min.js", prefix: prefix},
{path: "/feather-client/lib/jquery.tmpl.js", prefix: prefix},
{path: "/feather-client/lib/jquery.cookie.js", prefix: prefix},
Expand Down

0 comments on commit 8427958

Please sign in to comment.