diff options
| author | Mark Otto <[email protected]> | 2013-10-20 22:55:45 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-10-20 22:55:45 -0700 |
| commit | 2eec3f919e7bd7ee847c2631ae9c53515cac1c8f (patch) | |
| tree | b9dd9c6b61fcb72aafe47dd85beac8cfb9da4fe2 /package.json | |
| parent | ab3d0a27b3d93eebff3852728f94ddc4fcb35199 (diff) | |
| parent | 6585c5898a47deb2df5f7db4f9ef3fe8fa1e5a4a (diff) | |
| download | bootstrap-2eec3f919e7bd7ee847c2631ae9c53515cac1c8f.tar.xz bootstrap-2eec3f919e7bd7ee847c2631ae9c53515cac1c8f.zip | |
Merge branch 'master' into pr/10656
Conflicts:
dist/css/bootstrap.min.css
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/package.json b/package.json index af3c00a14..a4b5fdefb 100644 --- a/package.json +++ b/package.json @@ -3,8 +3,8 @@ , "description": "Sleek, intuitive, and powerful front-end framework for faster and easier web development." , "version": "3.0.0" , "keywords": ["bootstrap", "css"] - , "homepage": "http://twbs.github.com/bootstrap/" - , "author": "Twitter Inc." + , "homepage": "http://getbootstrap.com" + , "author": "Twitter, Inc." , "scripts": { "test": "grunt test" } , "repository": { "type": "git" @@ -20,18 +20,19 @@ } ] , "devDependencies": { - "grunt": "~0.4.1" + "browserstack-runner": "~0.0.12" + , "btoa": "~1.1.1" + , "grunt": "~0.4.1" , "grunt-contrib-clean": "~0.5.0" - , "grunt-contrib-connect": "~0.4.1" , "grunt-contrib-concat": "~0.3.0" + , "grunt-contrib-connect": "~0.5.0" , "grunt-contrib-copy": "~0.4.1" , "grunt-contrib-jshint": "~0.6.4" + , "grunt-contrib-qunit": "~0.3.0" , "grunt-contrib-uglify": "~0.2.4" - , "grunt-contrib-qunit": "~0.2.2" , "grunt-contrib-watch": "~0.5.3" , "grunt-html-validation": "~0.1.5" - , "grunt-jekyll": "~0.3.9" + , "grunt-jekyll": "~0.4.0" , "grunt-recess": "~0.4.0" - , "browserstack-runner": "~0.0.12" } } |