Merge branch 'master' into feature-3.9.0

This commit is contained in:
afc163 2018-08-25 23:18:03 +08:00
commit 9d61dfff7a

View File

@ -7,11 +7,11 @@ title:
## zh-CN
`strokeLinecap="square|round"` 可以调整进度条边缘的形状。
通过设定 `strokeLinecap="square|round"` 可以调整进度条边缘的形状。
## en-US
By setting `strokeLinecap="square`, you can change the linecaps from round to square.
By setting `strokeLinecap="square"`, you can change the linecaps from round to square.
````jsx
import { Progress } from 'antd';