Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into add-time-components
Browse files Browse the repository at this point in the history
  • Loading branch information
hwbllmnn committed Jan 5, 2018
2 parents 413738c + ea80f41 commit 6b4a0c9
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@
"babel-preset-stage-0": "6.24.1",
"canvas-prebuilt": "1.6.5-prerelease.1",
"coveralls": "3.0.0",
"css-loader": "0.28.7",
"css-loader": "0.28.8",
"enzyme": "3.3.0",
"enzyme-adapter-react-16": "1.1.1",
"eslint": "4.14.0",
Expand Down

0 comments on commit 6b4a0c9

Please sign in to comment.