Skip to content

Commit

Permalink
Merge branch 'master' into livedemo
Browse files Browse the repository at this point in the history
  • Loading branch information
martijnrusschen committed Jan 14, 2015
2 parents 0a9e396 + 832b4cb commit eee21a3
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@
"grunt-browserify": "3.0.1",
"grunt-contrib-sass": "0.8.1",
"grunt-contrib-watch": "0.6.1",
"grunt-jest": "^0.1.1",
"grunt-jest": "0.1.1",
"grunt-jsxhint": "0.3.0",
"react-tools": "0.11.1",
"jest-cli": "^0.1.17"
"jest-cli": "0.1.18"
},
"dependencies": {
"react": "^0.11",
Expand Down

0 comments on commit eee21a3

Please sign in to comment.