diff options
| author | Jacob Thornton <[email protected]> | 2013-08-07 23:10:11 -0700 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2013-08-07 23:10:11 -0700 |
| commit | 89b69ed77035eeb9c0034534d75fdb2062f10d47 (patch) | |
| tree | 99b1f65ee730de94e64b4992e5131f0432743b1e /package.json | |
| parent | b35b65d0b3689f7999be998411e632046548af6e (diff) | |
| parent | f3104a3e3b04c2817094ef8ebd351833a4ade420 (diff) | |
| download | bootstrap-89b69ed77035eeb9c0034534d75fdb2062f10d47.tar.xz bootstrap-89b69ed77035eeb9c0034534d75fdb2062f10d47.zip | |
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
Conflicts:
_layouts/customize.html
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 e9e8fd29c..5f1428316 100644 --- a/package.json +++ b/package.json @@ -26,5 +26,6 @@ , "grunt-contrib-qunit": "~0.2.2" , "grunt-contrib-watch": "~0.5.1" , "grunt-recess": "~0.3.3" + , "browserstack-runner": "~0.0.11" } } |