0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-02 14:24:19 +01:00

Merge branch 'master' of github.com:twbs/bootstrap

This commit is contained in:
Mark Otto 2013-09-04 17:46:39 -07:00
commit fc8e66d2cb
2 changed files with 10 additions and 10 deletions

View File

@ -56,7 +56,7 @@ Bootstrap uses [Grunt](http://gruntjs.com/) with convenient methods for working
From the command line: From the command line:
1. Install `grunt-cli` globally with `npm install -g grunt-cli`. 1. Install `grunt-cli` globally with `npm install -g grunt-cli`.
2. Install the [necessary local dependencies](package.json) via `npm install` 2. From the root `/bootstrap` directory, install the [necessary local dependencies](package.json) via `npm install`.
When completed, you'll be able to run the various Grunt commands provided from the command line. When completed, you'll be able to run the various Grunt commands provided from the command line.

View File

@ -22,16 +22,16 @@
, "devDependencies": { , "devDependencies": {
"grunt": "~0.4.1" "grunt": "~0.4.1"
, "grunt-contrib-clean": "~0.5.0" , "grunt-contrib-clean": "~0.5.0"
, "grunt-contrib-connect": "~0.4.0" , "grunt-contrib-connect": "~0.4.1"
, "grunt-contrib-concat": "~0.3.0" , "grunt-contrib-concat": "~0.3.0"
, "grunt-contrib-copy": "~0.4.0" , "grunt-contrib-copy": "~0.4.1"
, "grunt-contrib-jshint": "~0.6.0" , "grunt-contrib-jshint": "~0.6.4"
, "grunt-contrib-uglify": "~0.2.2" , "grunt-contrib-uglify": "~0.2.4"
, "grunt-contrib-qunit": "~0.2.2" , "grunt-contrib-qunit": "~0.2.2"
, "grunt-contrib-watch": "~0.5.1" , "grunt-contrib-watch": "~0.5.3"
, "grunt-html-validation": "~0.1.4" , "grunt-html-validation": "~0.1.5"
, "grunt-jekyll": "~0.3.8" , "grunt-jekyll": "~0.3.9"
, "grunt-recess": "~0.3.3" , "grunt-recess": "~0.4.0"
, "browserstack-runner": "~0.0.11" , "browserstack-runner": "~0.0.12"
} }
} }