Skip to content

Commit

Permalink
Merge pull request #1778 from marionettejs/sjs/bump-jquery-dep
Browse files Browse the repository at this point in the history
Loosen jquery dep
  • Loading branch information
jamiebuilds committed Sep 1, 2014
2 parents 707ad49 + 9716e06 commit 652c3a9
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"underscore": "1.4.4 - 1.7.0",
"backbone.babysitter": "^0.1.0",
"backbone.wreqr": "^1.0.0",
"jquery": "1.8.0 - 2.1.0"
"jquery": "^1.8.0 || ^2.0.0"
},
"devDependencies": {
"sinonjs": "1.7.3",
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
"grunt-plato": "~0.1.4",
"grunt-preprocess": "~4.0.0",
"grunt-template": "^0.2.3",
"jquery": "^2.1.1",
"jquery": "^1.8.0 || ^2.0.0",
"jsdom": "^0.10.5",
"load-grunt-tasks": "0.3.0",
"mocha": "^1.19.0",
Expand Down

0 comments on commit 652c3a9

Please sign in to comment.