diff options
| author | Mark Otto <[email protected]> | 2014-01-29 22:18:29 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-01-29 22:18:29 -0800 |
| commit | d2f1887bb5e7b651b11d6dd22ce191c733717a83 (patch) | |
| tree | 18aec6ab68ae29013e85a4a184baf33afa346769 /package.json | |
| parent | e38fd138ce04d73e03100a3ea42496fc914120e9 (diff) | |
| parent | 9195d8e8eb51208e4272e4c7e0851e2695da1a0d (diff) | |
| download | bootstrap-d2f1887bb5e7b651b11d6dd22ce191c733717a83.tar.xz bootstrap-d2f1887bb5e7b651b11d6dd22ce191c733717a83.zip | |
Merge branch 'master' into pr/12388
Conflicts:
dist/css/bootstrap.min.css
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/package.json b/package.json index 20bb8b24c..40c4a81bb 100644 --- a/package.json +++ b/package.json @@ -27,6 +27,7 @@ "devDependencies": { "browserstack-runner": "~0.0.15", "btoa": "~1.1.1", + "canonical-json": "~0.0.3", "grunt": "~0.4.2", "grunt-banner": "~0.2.0", "grunt-contrib-clean": "~0.5.0", @@ -42,6 +43,7 @@ "grunt-contrib-uglify": "~0.3.0", "grunt-contrib-watch": "~0.5.3", "grunt-csscomb": "~2.0.1", + "grunt-exec": "0.4.3", "grunt-html-validation": "~0.1.13", "grunt-jekyll": "~0.4.1", "grunt-jscs-checker": "~0.3.0", |