Skip to content

Commit

Permalink
Merge branch 'release/1.1.11'
Browse files Browse the repository at this point in the history
  • Loading branch information
SeeThruHead committed Dec 10, 2015
2 parents e252100 + a3c762f commit 4c72193
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "patternity",
"version": "1.1.10",
"version": "1.1.11",
"description": "Patternity is the pattern library and style guide for all Influitive apps",
"main": "index.js",
"scripts": {
Expand Down
4 changes: 2 additions & 2 deletions src/button2/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ class Button extends Component {
inverse: PropTypes.bool,
isSubmit: PropTypes.bool,
style: PropTypes.object,
classList: PropTypes.classList,
classList: PropTypes.string
}

static defaultProps = {
Expand Down Expand Up @@ -51,4 +51,4 @@ class Button extends Component {
}
}

export default Button;
export default Button;

0 comments on commit 4c72193

Please sign in to comment.