diff options
| author | Mark Otto <[email protected]> | 2013-08-06 18:29:54 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-08-06 18:29:54 -0700 |
| commit | 402dbfb6171e18aa44e19429e796169f02b0adf7 (patch) | |
| tree | aeb0cef7cc1b04988307a0ef79b07fbe2d7d197c /browserstack.json | |
| parent | 7e19b6b02ccd5417a6c2d3d418c08219773f1112 (diff) | |
| parent | 41bdd1a4823feb8b46b2fccfeec3e9c5057a0665 (diff) | |
| download | bootstrap-402dbfb6171e18aa44e19429e796169f02b0adf7.tar.xz bootstrap-402dbfb6171e18aa44e19429e796169f02b0adf7.zip | |
Merge branch '3.0.0-wip' into bs3_theme
Conflicts:
dist/css/bootstrap.min.css
Diffstat (limited to 'browserstack.json')
| -rw-r--r-- | browserstack.json | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/browserstack.json b/browserstack.json new file mode 100644 index 000000000..76564eb27 --- /dev/null +++ b/browserstack.json @@ -0,0 +1,37 @@ +{ + "username": "--secure--", + "key": "--secure--", + "test_path": "js/tests/index.html", + "browsers": [ + { + "browser": "firefox", + "browser_version": "latest", + "os": "OS X", + "os_version": "Mountain Lion" + }, + { + "browser": "safari", + "browser_version": "latest", + "os": "OS X", + "os_version": "Mountain Lion" + }, + { + "browser": "chrome", + "browser_version": "latest", + "os": "OS X", + "os_version": "Mountain Lion" + }, + { + "browser": "firefox", + "browser_version": "latest", + "os": "Windows", + "os_version": "7" + }, + { + "browser": "chrome", + "browser_version": "latest", + "os": "Windows", + "os_version": "7" + } + ] +} |