diff options
| author | Mark Otto <[email protected]> | 2014-02-11 09:50:40 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-02-11 09:50:40 -0800 |
| commit | 8551f42ae2935c96bd37ae8ed15198a0cc22ede2 (patch) | |
| tree | 77498aad62c25da55fb121470d91623c14873f58 /browserstack.json | |
| parent | b36d19c3c6caf89fbe996678bdefe3f7e9a69281 (diff) | |
| parent | 2cef0af211e8b6780fff90fe5f110493585aa97c (diff) | |
| download | bootstrap-8551f42ae2935c96bd37ae8ed15198a0cc22ede2.tar.xz bootstrap-8551f42ae2935c96bd37ae8ed15198a0cc22ede2.zip | |
Merge branch 'master' into pr/12412
Conflicts:
dist/css/bootstrap-theme.css.map
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
docs/assets/js/customize.min.js
docs/assets/js/raw-files.min.js
docs/dist/css/bootstrap-theme.css.map
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
test-infra/npm-shrinkwrap.canonical.json
Diffstat (limited to 'browserstack.json')
| -rw-r--r-- | browserstack.json | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/browserstack.json b/browserstack.json index beab742e1..6ca781e5f 100644 --- a/browserstack.json +++ b/browserstack.json @@ -17,12 +17,6 @@ "os_version": "Mavericks" }, { - "browser": "chrome", - "browser_version": "latest", - "os": "OS X", - "os_version": "Mavericks" - }, - { "browser": "firefox", "browser_version": "latest", "os": "Windows", |