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
..
__snapshots__	Merge remote-tracking branch 'origin/master' into 2.0	2020-05-26 17:49:55 +08:00
Modal.test.js	refactor: portal	2020-05-13 18:36:53 +08:00
confirm.test.js	release 1.6.0	2020-05-15 14:11:58 +08:00
demo.test.js	style: lint add semi and prettier	2019-01-12 12:46:29 +08:00