Merge branch '0.8.0' of github.com:ant-design/ant-design into 0.8.0

This commit is contained in:
afc163
2015-08-20 11:46:28 +08:00
2 changed files with 2 additions and 2 deletions
+1 -1
View File
@@ -1,4 +1,4 @@
import Carousel from 'react-slick';
import Carousel from 'react-slick2';
import React from 'react';
import assign from 'object-assign';
+1 -1
View File
@@ -60,7 +60,7 @@
"rc-tree": "~0.14.3",
"rc-upload": "~1.3.1",
"rc-util": "~2.0.3",
"react-slick": "~0.6.4",
"react-slick2": "~0.6.6",
"reqwest": "~2.0.1"
},
"devDependencies": {