diff options
| author | Mark Otto <[email protected]> | 2014-03-08 20:34:29 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-03-08 20:34:29 -0800 |
| commit | ef5d8e98e2e9aa87496eef8359667f7e052ae636 (patch) | |
| tree | 0d202235247562f094df841960170b1245ea728b /browserstack.json | |
| parent | dc5917bedfda321b72310209d2807ea10347f7ed (diff) | |
| parent | e4d13e238d0d6ea241f4e77328f6551206d17362 (diff) | |
| download | bootstrap-ef5d8e98e2e9aa87496eef8359667f7e052ae636.tar.xz bootstrap-ef5d8e98e2e9aa87496eef8359667f7e052ae636.zip | |
Merge branch 'master' into sr-only-focusable
Conflicts:
dist/css/bootstrap.css
Diffstat (limited to 'browserstack.json')
| -rw-r--r-- | browserstack.json | 38 |
1 files changed, 0 insertions, 38 deletions
diff --git a/browserstack.json b/browserstack.json deleted file mode 100644 index 6ca781e5f..000000000 --- a/browserstack.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "username": "--secure--", - "key": "--secure--", - "test_path": "js/tests/index.html", - "debug": true, - "browsers": [ - { - "browser": "firefox", - "browser_version": "latest", - "os": "OS X", - "os_version": "Mavericks" - }, - { - "browser": "safari", - "browser_version": "latest", - "os": "OS X", - "os_version": "Mavericks" - }, - { - "browser": "firefox", - "browser_version": "latest", - "os": "Windows", - "os_version": "8.1" - }, - { - "browser": "chrome", - "browser_version": "latest", - "os": "Windows", - "os_version": "8.1" - }, - { - "browser": "Mobile Safari", - "os": "ios", - "os_version": "7.0", - "device": "iPhone 5S" - } - ] -} |