diff options
| author | Mark Otto <[email protected]> | 2014-02-08 16:52:22 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-02-08 16:52:22 -0800 |
| commit | e9199718d64dadc22d61b4cea8c77a2307455823 (patch) | |
| tree | b10f0174a9d564da40df55d658136fef74b6adb9 /browserstack.json | |
| parent | 4787a69efbe0fcd81228781b3c91dfe198aa0f1b (diff) | |
| parent | 7f88009394e72395aa7a458ae442b0c3037dbd15 (diff) | |
| download | bootstrap-e9199718d64dadc22d61b4cea8c77a2307455823.tar.xz bootstrap-e9199718d64dadc22d61b4cea8c77a2307455823.zip | |
Merge branch 'master' into fix-12154
Conflicts:
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
Diffstat (limited to 'browserstack.json')
| -rw-r--r-- | browserstack.json | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/browserstack.json b/browserstack.json new file mode 100644 index 000000000..6ca781e5f --- /dev/null +++ b/browserstack.json @@ -0,0 +1,38 @@ +{ + "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" + } + ] +} |