diff options
| author | Mark Otto <[email protected]> | 2012-11-05 18:27:25 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-11-05 18:27:25 -0800 |
| commit | c0bbe1692c72d046f7496a9dc90329cc1a51c54d (patch) | |
| tree | e8a98b7f91814c244b1209fc05ff40b89adec3fb /package.json | |
| parent | 34880e3ef569c7ed8116f033bedb038129dd304b (diff) | |
| parent | 79b701722797d9f5b2e90825c0621d44c0ad6030 (diff) | |
| download | bootstrap-c0bbe1692c72d046f7496a9dc90329cc1a51c54d.tar.xz bootstrap-c0bbe1692c72d046f7496a9dc90329cc1a51c54d.zip | |
Merge branch '2.2.2-wip' into exploratory
Conflicts:
docs/assets/css/bootstrap.css
less/navbar.less
less/variables.less
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/package.json b/package.json index efe95a7fc..7920d2cc2 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "bootstrap" , "description": "Sleek, intuitive, and powerful front-end framework for faster and easier web development." - , "version": "2.2.1" + , "version": "2.2.2" , "keywords": ["bootstrap", "css"] , "homepage": "http://twitter.github.com/bootstrap/" , "author": "Twitter Inc." |