aboutsummaryrefslogtreecommitdiff
path: root/package.json
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-10-13 15:24:48 -0700
committerMark Otto <[email protected]>2013-10-13 15:24:48 -0700
commit857e697d72eed7a02591e2f8eebd913a69d862df (patch)
tree9a02033472ccacc3648f40bfaaf18f95d7c5648b /package.json
parentef2e0c99f4c5958eb16a401b73a39465a301a484 (diff)
parentc75f8a5bf64acc5ffb45c8bb6221e412b0b08bcd (diff)
downloadbootstrap-857e697d72eed7a02591e2f8eebd913a69d862df.tar.xz
bootstrap-857e697d72eed7a02591e2f8eebd913a69d862df.zip
Merge branch 'master' of github.com:twbs/bootstrap
Diffstat (limited to 'package.json')
-rw-r--r--package.json4
1 files changed, 2 insertions, 2 deletions
diff --git a/package.json b/package.json
index c60f2decf..a4b5fdefb 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,8 @@
}
]
, "devDependencies": {
- "btoa": "~1.1.1"
+ "browserstack-runner": "~0.0.12"
+ , "btoa": "~1.1.1"
, "grunt": "~0.4.1"
, "grunt-contrib-clean": "~0.5.0"
, "grunt-contrib-concat": "~0.3.0"
@@ -33,6 +34,5 @@
, "grunt-html-validation": "~0.1.5"
, "grunt-jekyll": "~0.4.0"
, "grunt-recess": "~0.4.0"
- , "browserstack-runner": "~0.0.12"
}
}