diff options
| author | Mark Otto <[email protected]> | 2013-12-04 21:23:09 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-12-04 21:23:09 -0800 |
| commit | cf81cb60ef9e29fd5b97c7a7d213dbf80cad0be6 (patch) | |
| tree | 9d05ca6eb1fb77bb9b854d37c7ed5d178c02d0a9 /browserstack.json | |
| parent | 3f1e4b92eefaee617115973eba98fc7cc0905ab8 (diff) | |
| parent | 8c5dc542a553d93d4ee26db176e515f5164be8a7 (diff) | |
| download | bootstrap-cf81cb60ef9e29fd5b97c7a7d213dbf80cad0be6.tar.xz bootstrap-cf81cb60ef9e29fd5b97c7a7d213dbf80cad0be6.zip | |
Merge branch 'master' into gradient-prefix-cleanup
Conflicts:
dist/css/bootstrap.min.css
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 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" - } - ] -} |