diff options
| author | Mark Otto <[email protected]> | 2013-12-14 16:56:56 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-12-14 16:56:56 -0800 |
| commit | 46c3d27468accdf98dd49257f17bdc507890a1c6 (patch) | |
| tree | 9067b23767a152c8cb58f2a2d24bf1276e407e5b /browserstack.json | |
| parent | aad447e29075b52a46931be17a9be4016cc89ef1 (diff) | |
| parent | 4c64c1eecdb52d943a50d2c181aeb915a3caed34 (diff) | |
| download | bootstrap-46c3d27468accdf98dd49257f17bdc507890a1c6.tar.xz bootstrap-46c3d27468accdf98dd49257f17bdc507890a1c6.zip | |
Merge branch 'master' into pr/11435
Conflicts:
dist/css/bootstrap.css
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 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" - } - ] -} |