diff options
| author | Mark Otto <[email protected]> | 2013-12-04 21:23:09 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-12-04 21:23:09 -0800 |
| commit | cf81cb60ef9e29fd5b97c7a7d213dbf80cad0be6 (patch) | |
| tree | 9d05ca6eb1fb77bb9b854d37c7ed5d178c02d0a9 /package.json | |
| parent | 3f1e4b92eefaee617115973eba98fc7cc0905ab8 (diff) | |
| parent | 8c5dc542a553d93d4ee26db176e515f5164be8a7 (diff) | |
| download | bootstrap-cf81cb60ef9e29fd5b97c7a7d213dbf80cad0be6.tar.xz bootstrap-cf81cb60ef9e29fd5b97c7a7d213dbf80cad0be6.zip | |
Merge branch 'master' into gradient-prefix-cleanup
Conflicts:
dist/css/bootstrap.min.css
docs-assets/js/raw-files.js
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/package.json b/package.json index bc2a004af..813cf1d13 100644 --- a/package.json +++ b/package.json @@ -20,8 +20,7 @@ } ] , "devDependencies": { - "browserstack-runner": "~0.0.12" - , "btoa": "~1.1.1" + "btoa": "~1.1.1" , "grunt": "~0.4.1" , "grunt-contrib-clean": "~0.5.0" , "grunt-contrib-concat": "~0.3.0" @@ -34,6 +33,7 @@ , "grunt-html-validation": "~0.1.6" , "grunt-jekyll": "~0.4.0" , "grunt-recess": "~0.5.0" + , "grunt-saucelabs": "~4.1.2" , "grunt-sed": "~0.1.1" , "regexp-quote": "~0.0.0" } |