diff options
| author | Mark Otto <[email protected]> | 2013-12-08 02:00:37 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-12-08 02:00:37 -0800 |
| commit | c37b710e85e379ddffb305af8a765013c0cd0333 (patch) | |
| tree | 8c23e05b150a14a39c2be90b39d03343b8c994f7 /package.json | |
| parent | b5008ebf9ca1c9c90a6ec73ae12e55a8f155017f (diff) | |
| parent | e43e87b2f30a9f4967818f1ce8d25a4f88a1f490 (diff) | |
| download | bootstrap-c37b710e85e379ddffb305af8a765013c0cd0333.tar.xz bootstrap-c37b710e85e379ddffb305af8a765013c0cd0333.zip | |
Merge branch 'master' into pr/11744
Conflicts:
dist/css/bootstrap.min.css
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/package.json b/package.json index 813cf1d13..3c9fd7fe6 100644 --- a/package.json +++ b/package.json @@ -32,6 +32,7 @@ , "grunt-contrib-watch": "~0.5.3" , "grunt-html-validation": "~0.1.6" , "grunt-jekyll": "~0.4.0" + , "grunt-jscs-checker": "~0.2.5" , "grunt-recess": "~0.5.0" , "grunt-saucelabs": "~4.1.2" , "grunt-sed": "~0.1.1" |