diff options
| author | Mark Otto <[email protected]> | 2013-12-03 22:58:25 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-12-03 22:58:25 -0800 |
| commit | a42e9163cbf6dcdd72a004a4a7c2b787478e18b0 (patch) | |
| tree | 6ba50185884ca0a425d7185ac63949102d96002e /browserstack.json | |
| parent | 303f8a33c354b5c8f6132574de55114b8f39a1f1 (diff) | |
| parent | ed0d556847a7a1168a05a6a71f8f1af23139327b (diff) | |
| download | bootstrap-a42e9163cbf6dcdd72a004a4a7c2b787478e18b0.tar.xz bootstrap-a42e9163cbf6dcdd72a004a4a7c2b787478e18b0.zip | |
Merge branch 'master' into responsive-visibility-table
Conflicts:
dist/css/bootstrap.min.css
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" - } - ] -} |