tangjinzhou 518cc852af Merge remote-tracking branch 'origin/master' into 2.0 ... # Conflicts: # antdv-demo # components/alert/__tests__/__snapshots__/demo.test.js.snap # components/auto-complete/__tests__/__snapshots__/demo.test.js.snap # components/avatar/__tests__/__snapshots__/demo.test.js.snap # components/badge/__tests__/__snapshots__/demo.test.js.snap # components/calendar/__tests__/__snapshots__/demo.test.js.snap # components/calendar/__tests__/__snapshots__/index.test.js.snap # components/card/__tests__/__snapshots__/demo.test.js.snap # components/cascader/__tests__/__snapshots__/demo.test.js.snap # components/cascader/__tests__/__snapshots__/index.test.js.snap # components/collapse/__tests__/__snapshots__/demo.test.js.snap # components/date-picker/__tests__/__snapshots__/DatePicker.test.js.snap # components/date-picker/__tests__/__snapshots__/demo.test.js.snap # components/date-picker/__tests__/__snapshots__/other.test.js.snap # components/dropdown/__tests__/__snapshots__/demo.test.js.snap # components/empty/__tests__/__snapshots__/demo.test.js.snap # components/form-model/__tests__/__snapshots__/demo.test.js.snap # components/form/__tests__/__snapshots__/demo.test.js.snap # components/icon/__tests__/__snapshots__/index.test.js.snap # components/icon/index.js # components/input-number/__tests__/__snapshots__/demo.test.js.snap # components/input/__tests__/__snapshots__/demo.test.js.snap # components/input/__tests__/__snapshots__/index.test.js.snap # components/locale-provider/__tests__/__snapshots__/demo.test.js.snap # components/locale-provider/__tests__/__snapshots__/index.test.js.snap # components/modal/__tests__/__snapshots__/Modal.test.js.snap # components/page-header/__tests__/__snapshots__/demo.test.js.snap # components/page-header/index.jsx # components/pagination/__tests__/__snapshots__/demo.test.js.snap # components/rate/__tests__/__snapshots__/demo.test.js.snap # components/select/__tests__/__snapshots__/demo.test.js.snap # components/select/__tests__/__snapshots__/index.test.js.snap # components/slider/__tests__/__snapshots__/demo.test.js.snap # components/spin/__tests__/__snapshots__/demo.test.js.snap # components/steps/__tests__/__snapshots__/demo.test.js.snap # components/switch/__tests__/__snapshots__/demo.test.js.snap # components/table/__tests__/__snapshots__/Table.filter.test.js.snap # components/table/__tests__/__snapshots__/Table.sorter.test.js.snap # components/table/__tests__/__snapshots__/demo.test.js.snap # components/tabs/__tests__/__snapshots__/demo.test.js.snap # components/tabs/__tests__/__snapshots__/index.test.js.snap # components/time-picker/__tests__/__snapshots__/demo.test.js.snap # components/time-picker/__tests__/__snapshots__/index.test.js.snap # components/timeline/__tests__/__snapshots__/demo.test.js.snap # components/tree-select/__tests__/__snapshots__/demo.test.js.snap # components/tree/__tests__/__snapshots__/demo.test.js.snap # components/upload/__tests__/__snapshots__/demo.test.js.snap # components/upload/__tests__/__snapshots__/uploadlist.test.js.snap # types/message.d.ts		2020-04-05 15:09:21 +08:00
..
__tests__	…
style	…
index.js	…