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
..
demo.test.js.snap	Merge branch 'master' into feat-1.4.0	2019-08-25 22:09:55 +08:00
index.test.js.snap	fix: update icon focusable="false" #924	2019-07-07 21:27:16 +08:00
list.test.js.snap	feat: transfer change `searchChange` to `search`	2019-01-07 20:58:18 +08:00
search.test.js.snap	fix: update icon focusable="false" #924	2019-07-07 21:27:16 +08:00