Skip to content

Commit

Permalink
Merge branch 'jquery3' into no-really-the-functional-tests-are-fixed-…
Browse files Browse the repository at this point in the history
…now-seriously
  • Loading branch information
mistergone committed Sep 7, 2018
2 parents 794a050 + 70f5614 commit c66739e
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
"format-usd": "1.0.1",
"fs": "0.0.2",
"html5shiv": "3.7.3",
"jquery": "1.11.3",
"jquery": "^3.3.1",
"jquery.easing": "1.3.2",
"normalize-css": "2.3.1",
"normalize-legacy-addon": "0.1.0",
Expand Down

0 comments on commit c66739e

Please sign in to comment.