diff options
| author | Mark Otto <[email protected]> | 2013-12-11 22:39:03 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-12-11 22:39:03 -0800 |
| commit | 4fc2907723e7f7bb5b14eb5cec94d629b6834e7f (patch) | |
| tree | a9c1df41fbf5f912234f762f03668ea4ef9fd2b7 /browserstack.json | |
| parent | 0e8baab34ae21c813afb9d8c24b3cb2105aebc46 (diff) | |
| parent | 9966d035cd35c510369286cbb645340bdd6ffc95 (diff) | |
| download | bootstrap-4fc2907723e7f7bb5b14eb5cec94d629b6834e7f.tar.xz bootstrap-4fc2907723e7f7bb5b14eb5cec94d629b6834e7f.zip | |
Merge branch 'master' into docs_derp
Conflicts:
docs-assets/css/docs.css
docs-assets/js/application.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 104d85476..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" - } - ] -} |