tangjinzhou da0f17d1b6 Merge remote-tracking branch 'origin/master' into feat-1.4.0 ... # Conflicts: # components/affix/index.jsx # components/alert/index.jsx # components/back-top/index.jsx # components/carousel/index.jsx # components/cascader/index.jsx # components/comment/index.jsx # components/config-provider/index.jsx # components/divider/index.jsx # components/drawer/index.jsx # components/form/Form.jsx # components/input-number/index.jsx # components/menu/index.jsx # components/modal/confirm.js # components/modal/index.js # components/popconfirm/index.jsx # components/popover/index.jsx # components/rate/index.jsx # components/steps/index.jsx # components/switch/index.jsx # components/time-picker/index.jsx # components/tree-select/index.jsx # site/components.js		2019-08-28 22:36:44 +08:00
..
assets	style: lint add semi and prettier	2019-01-12 12:46:29 +08:00
demo	style: fix code format	2019-05-28 11:37:38 +08:00
Notice.jsx	feat: update vc-notification to 3.3.1	2019-03-04 12:12:50 +08:00
Notification.jsx	chore: add base.vue inconsistent vue version	2019-08-28 10:50:19 +08:00
index.js	feat: update vc-notification to 3.3.1	2019-03-04 12:12:50 +08:00