tanjinzhou 6069a254db Merge remote-tracking branch 'origin/master' into 2.0 ... # Conflicts: # antdv-demo # components/auto-complete/__tests__/__snapshots__/demo.test.js.snap # components/avatar/__tests__/__snapshots__/demo.test.js.snap # components/button/__tests__/__snapshots__/demo.test.js.snap # components/collapse/__tests__/__snapshots__/demo.test.js.snap # components/date-picker/__tests__/__snapshots__/demo.test.js.snap # components/form/__tests__/__snapshots__/demo.test.js.snap # components/input/__tests__/__snapshots__/demo.test.js.snap # components/locale-provider/__tests__/__snapshots__/index.test.js.snap # components/select/__tests__/__snapshots__/demo.test.js.snap # components/tag/__tests__/__snapshots__/demo.test.js.snap # components/vc-dialog/Dialog.jsx		2020-05-26 17:49:55 +08:00
..
__tests__	Merge remote-tracking branch 'origin/master' into 2.0	2020-05-26 17:49:55 +08:00
style	Feat 1.5.0 (#1853)	2020-03-07 19:45:13 +08:00
index.jsx	chore: add base.vue inconsistent vue version	2019-08-28 10:50:19 +08:00
Timeline.jsx	feat: update timeline icon (#1970)	2020-03-28 15:54:31 +08:00
TimelineItem.jsx	Feat 1.5.0 (#1853)	2020-03-07 19:45:13 +08:00