diff options
| author | Mark Otto <[email protected]> | 2014-03-07 01:30:28 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-03-07 01:30:28 -0800 |
| commit | 0143e38a672335b7ca2d73d0de5b2a2b4618f9e9 (patch) | |
| tree | 7188809b7c2194fc0aca9a65b7d07725ee4206d5 /browserstack.json | |
| parent | 642fd5100293755a6003448d4a481f3b314edf15 (diff) | |
| parent | 1f148427de6d35a06e225deeee0b162b11955232 (diff) | |
| download | bootstrap-0143e38a672335b7ca2d73d0de5b2a2b4618f9e9.tar.xz bootstrap-0143e38a672335b7ca2d73d0de5b2a2b4618f9e9.zip | |
Merge branch 'master' into document_popover_focus
Conflicts:
docs/assets/js/docs.min.js
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" - } - ] -} |