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
..
__tests__	fix: update icon focusable="false" #924	2019-07-07 21:27:16 +08:00
demo	feat: update progress	2019-04-25 20:23:14 +08:00
style	feat: update style to 3.13.6	2019-03-30 16:06:06 +08:00
circle.jsx	fix: update progress api and test	2019-04-30 13:31:21 +08:00
index.en-US.md	fix: update progress api and test	2019-04-30 13:31:21 +08:00
index.jsx	chore: add base.vue inconsistent vue version	2019-08-28 10:50:19 +08:00
index.zh-CN.md	fix: update progress api and test	2019-04-30 13:31:21 +08:00
line.jsx	fix: update progress api and test	2019-04-30 13:31:21 +08:00
progress.jsx	style: fix code format	2019-05-28 11:37:38 +08:00
utils.js	style: fix code format	2019-05-28 11:37:38 +08:00