diff options
| author | Mark Otto <[email protected]> | 2013-10-13 18:32:34 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-10-13 18:32:34 -0700 |
| commit | 265fda7903e189ee0d2d7201cc92bf384fc53043 (patch) | |
| tree | cf2249e0696d6ea2923678f9f7b155e265756f03 /package.json | |
| parent | a46003b8c7cc20bf4f72b7638a74643353ae047f (diff) | |
| parent | 727a91de1cdf5cbc4f25528e073480332a5940c5 (diff) | |
| download | bootstrap-265fda7903e189ee0d2d7201cc92bf384fc53043.tar.xz bootstrap-265fda7903e189ee0d2d7201cc92bf384fc53043.zip | |
Merge branch 'master' into restore_grid_mixins
Conflicts:
dist/css/bootstrap.min.css
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/package.json b/package.json index 157872dfc..a4b5fdefb 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,9 @@ } ] , "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-concat": "~0.3.0" , "grunt-contrib-connect": "~0.5.0" @@ -30,8 +32,7 @@ , "grunt-contrib-uglify": "~0.2.4" , "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" } } |