diff options
| author | Mark Otto <[email protected]> | 2013-12-14 16:20:19 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-12-14 16:20:19 -0800 |
| commit | 83c60ef3eec234b3dac94c841fd1f13f94aab36f (patch) | |
| tree | 0d896dedbbd47723ab769b139b63a5a58778e578 /browserstack.json | |
| parent | 3bfa630d2afe70452861b2466daab78daa47dda8 (diff) | |
| parent | 4afcebe0e71aafd0cfb501548a6591effdbe2e70 (diff) | |
| download | bootstrap-83c60ef3eec234b3dac94c841fd1f13f94aab36f.tar.xz bootstrap-83c60ef3eec234b3dac94c841fd1f13f94aab36f.zip | |
Merge branch 'master' into pr/11107
Conflicts:
docs-assets/js/raw-files.js
Diffstat (limited to 'browserstack.json')
| -rw-r--r-- | browserstack.json | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/browserstack.json b/browserstack.json deleted file mode 100644 index 76564eb27..000000000 --- a/browserstack.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "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" - } - ] -} |