diff options
| author | Mark Otto <[email protected]> | 2014-01-09 20:33:55 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-01-09 20:33:55 -0800 |
| commit | ea20f44815b535975d1f1416fee15bd1ea7acdb3 (patch) | |
| tree | edb73c6ae943629dbdc51d3350a50a079f7a2f7e /package.json | |
| parent | 04161a8c753c5f9ef83dd1f0848a17e8c4ab155c (diff) | |
| parent | 7f153974e10980dccbdd485e63941b591e925148 (diff) | |
| download | bootstrap-ea20f44815b535975d1f1416fee15bd1ea7acdb3.tar.xz bootstrap-ea20f44815b535975d1f1416fee15bd1ea7acdb3.zip | |
Merge branch 'master' into docs_derp
Conflicts:
docs/assets/css/docs.css
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/package.json b/package.json index 34a3fa5c2..8bcd4840e 100644 --- a/package.json +++ b/package.json @@ -33,8 +33,9 @@ "grunt-contrib-connect": "~0.6.0", "grunt-contrib-copy": "~0.5.0", "grunt-contrib-csslint": "~0.2.0", + "grunt-contrib-jade": "~0.9.1", "grunt-contrib-jshint": "~0.8.0", - "grunt-contrib-less": "~0.8.3", + "grunt-contrib-less": "~0.9.0", "grunt-contrib-qunit": "~0.3.0", "grunt-contrib-uglify": "~0.2.7", "grunt-contrib-watch": "~0.5.3", @@ -44,7 +45,8 @@ "grunt-jscs-checker": "~0.3.0", "grunt-saucelabs": "~4.1.2", "grunt-sed": "~0.1.1", - "load-grunt-tasks": "~0.2.1" + "load-grunt-tasks": "~0.2.1", + "markdown": "~0.5.0" }, "jspm": { "main": "js/bootstrap", |