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
..
Base	cr tree-select	2019-06-26 08:28:17 +08:00
Popup	style: lint add semi and prettier	2019-01-12 12:46:29 +08:00
Selector	cr vc-time-picker	2019-06-27 22:00:08 +08:00
SearchInput.jsx	perf: inject default	2019-01-28 21:09:13 +08:00
Select.jsx	feat: update tree-select	2019-04-10 11:54:42 +08:00
SelectNode.jsx	fix: support v-slot #1058	2019-08-07 21:56:30 +08:00
SelectTrigger.jsx	style: lint add semi and prettier	2019-01-12 12:46:29 +08:00
index.js	style: lint add semi and prettier	2019-01-12 12:46:29 +08:00
propTypes.js	style: lint add semi and prettier	2019-01-12 12:46:29 +08:00
strategies.js	style: lint add semi and prettier	2019-01-12 12:46:29 +08:00
util.js	Merge branch 'master' into feat-1.4.0	2019-08-25 22:09:55 +08:00