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
DatePicker.test.js	test: update test	2019-01-25 18:00:36 +08:00
MonthPicker.test.js	style: lint add semi and prettier	2019-01-12 12:46:29 +08:00
RangePicker.test.js	bump 1.3.1	2019-01-15 10:14:36 +08:00
WeekPicker.test.js	fix: ie scrollerbar trigger blur event #999	2019-07-30 19:51:49 +08:00
demo.test.js	style: lint add semi and prettier	2019-01-12 12:46:29 +08:00
mount.test.js	Feat 1.5.0 (#1853)	2020-03-07 19:45:13 +08:00
other.test.js	cr cxxx- exxx	2019-09-10 18:57:08 +08:00
showTime.test.js	fix: ie scrollerbar trigger blur event #999	2019-07-30 19:51:49 +08:00
utils.js	style: format code	2019-12-21 18:37:33 +08:00