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 branch 'master' into 2.0	2020-04-05 22:44:37 +08:00
style	style: fix dropdown vertical padding variable substitution (#2287)	2020-05-24 22:15:37 +08:00
dropdown-button.jsx	feat: update dropdown to new icon (#1950)	2020-03-26 11:58:48 +08:00
dropdown.jsx	feat: update dropdown to new icon (#1950)	2020-03-26 11:58:48 +08:00
getDropdownProps.js	feat: merge master	2019-08-08 19:02:54 +08:00
index.js	chore: add base.vue inconsistent vue version	2019-08-28 10:50:19 +08:00