tangjinzhou 2349348de0 Merge branch 'master' into feat-1.4.0 ... # Conflicts: # components/button/__tests__/__snapshots__/demo.test.js.snap # components/button/buttonTypes.js # components/button/demo/basic.md # components/button/style/index.less # components/button/style/mixin.less # components/form/__tests__/__snapshots__/demo.test.js.snap # components/input/__tests__/__snapshots__/demo.test.js.snap # components/select/__tests__/__snapshots__/demo.test.js.snap # components/select/__tests__/__snapshots__/index.test.js.snap # components/tabs/__tests__/__snapshots__/demo.test.js.snap # components/vc-collapse/src/Collapse.jsx # package.json		2019-08-25 22:09:55 +08:00
..
__tests__	Merge branch 'master' into feat-1.4.0	2019-08-25 22:09:55 +08:00
demo	style: lint add semi and prettier	2019-01-12 12:46:29 +08:00
style	feat: update style to 3.13.6	2019-03-30 16:06:06 +08:00
MiniSelect.jsx	style: lint add semi and prettier	2019-01-12 12:46:29 +08:00
Pagination.jsx	feat: update list & pagination	2019-03-19 10:02:14 +08:00
index.en-US.md	feat: update list & pagination	2019-03-19 10:02:14 +08:00
index.js	style: lint add semi and prettier	2019-01-12 12:46:29 +08:00
index.zh-CN.md	feat: update list & pagination	2019-03-19 10:02:14 +08:00