Merge branch '1.x-stable' of https://github.com/ant-design/ant-design into 1.x-stable

This commit is contained in:
乐仪 2016-09-01 17:50:28 +08:00
commit 6c9ccd12d5

View File

@ -23,5 +23,5 @@ export default function ButtonGroup(props) {
} }
ButtonGroup.propTypes = { ButtonGroup.propTypes = {
size: React.PropTypes.oneOf(['large', 'small']), size: React.PropTypes.oneOf(['large', 'default', 'small']),
}; };