diff options
| author | Mark Otto <[email protected]> | 2013-12-15 14:10:48 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-12-15 14:10:48 -0800 |
| commit | 122245fe87bbd293a82ffa6b9c37d8b174b3dc0f (patch) | |
| tree | 35679d94b5787a2ffaf712caa0fab3bf47dd8fa3 /browserstack.json | |
| parent | 0fcaca86b57bf3a4fa2c8f709e90499c92e0db73 (diff) | |
| parent | 55f6beb4278979155549e17da6e87a2548ec0b88 (diff) | |
| download | bootstrap-122245fe87bbd293a82ffa6b9c37d8b174b3dc0f.tar.xz bootstrap-122245fe87bbd293a82ffa6b9c37d8b174b3dc0f.zip | |
Merge branch 'master' into pr/11676
Conflicts:
less/modals.less
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" - } - ] -} |