Skip to content

Commit f6fd34f

Browse files
committed
Merge remote-tracking branch 'upstream/master' into fix-travis
# Conflicts: # package.json
2 parents 5c63238 + b9c70e1 commit f6fd34f

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

package.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "react-sparklines",
3-
"version": "1.5.1",
3+
"version": "1.5.2",
44
"description": "Beautiful and expressive Sparklines component for React ",
55
"main": "build/index.js",
66
"directories": {
@@ -34,23 +34,23 @@
3434
"homepage": "https://github.com/borisyankov/react-sparklines#readme",
3535
"devDependencies": {
3636
"babel": "^6.5.2",
37-
"babel-core": "^6.7.2",
37+
"babel-core": "^6.7.6",
3838
"babel-loader": "^6.2.4",
3939
"babel-preset-es2015": "^6.6.0",
4040
"babel-preset-react": "^6.5.0",
4141
"babel-preset-stage-1": "^6.5.0",
4242
"babel-runtime": "^6.6.1",
4343
"chai": "^3.5.0",
44-
"enzyme": "^2.1.0",
44+
"enzyme": "^2.2.0",
4545
"mocha": "^2.4.5",
46-
"react-addons-test-utils": "^0.14.7",
47-
"react": "^0.14.7",
48-
"react-dom": "^0.14.7",
46+
"react": "^15.0.1",
47+
"react-addons-test-utils": "^15.0.1",
48+
"react-dom": "^15.0.1",
4949
"webpack": "^2.1.0-beta.4",
5050
"webpack-dev-server": "^2.0.0-beta"
5151
},
5252
"peerDependencies": {
53-
"react": "^0.14.7",
54-
"react-dom": "^0.14.7"
53+
"react": "*",
54+
"react-dom": "*"
5555
}
5656
}

0 commit comments

Comments
 (0)