diff options
| author | Mark Otto <[email protected]> | 2014-01-15 13:08:35 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-01-15 13:08:35 -0800 |
| commit | a633fc042d4060499964fca7333edc5ac55cde4b (patch) | |
| tree | 4422ee5ec858137d5b07a34e662dd1c493a6f06b /package.json | |
| parent | cae63200d8a645f385349debd940666ddbca0b38 (diff) | |
| parent | 1facbf6e7a32cfb1334e9c84a59c762c27f13cb5 (diff) | |
| download | bootstrap-a633fc042d4060499964fca7333edc5ac55cde4b.tar.xz bootstrap-a633fc042d4060499964fca7333edc5ac55cde4b.zip | |
Merge branch 'master' into docs_derp
Conflicts:
docs/components.html
docs/css.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 14d42ab7e..6d44ee937 100644 --- a/package.json +++ b/package.json @@ -25,6 +25,7 @@ } ], "devDependencies": { + "browserstack-runner": "~0.0.13", "btoa": "~1.1.1", "grunt": "~0.4.2", "grunt-banner": "~0.2.0", |