diff options
| author | Mark Otto <[email protected]> | 2013-11-06 14:04:54 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-11-06 14:04:54 -0800 |
| commit | 6df6723c156ab565c7b6341fc58582fceadd7649 (patch) | |
| tree | 4cc372a56ece6b8250b1bcadf433f6e5ea1853ca /package.json | |
| parent | b593df183087d88940d7af3e59b401685ada3dfe (diff) | |
| parent | 3887f540b978d593f433bfef15888bc2d103de72 (diff) | |
| download | bootstrap-6df6723c156ab565c7b6341fc58582fceadd7649.tar.xz bootstrap-6df6723c156ab565c7b6341fc58582fceadd7649.zip | |
Merge branch 'master' into docs_derp
Conflicts:
dist/css/bootstrap.min.css
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/package.json b/package.json index 46266fe0d..9d4912d53 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": "3.0.1" + , "version": "3.0.2" , "keywords": ["bootstrap", "css"] , "homepage": "http://getbootstrap.com" , "author": "Twitter, Inc." @@ -34,5 +34,7 @@ , "grunt-html-validation": "~0.1.6" , "grunt-jekyll": "~0.4.0" , "grunt-recess": "~0.4.0" + , "grunt-sed": "~0.1.1" + , "regexp-quote": "~0.0.0" } } |