diff options
| author | Mark Otto <[email protected]> | 2014-03-06 21:32:52 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-03-06 21:32:52 -0800 |
| commit | c8614c0f15f0ce78426c6403e57aff22c3ce2beb (patch) | |
| tree | 673d1a347374a8bf53a127c050dbc57762af3782 /browserstack.json | |
| parent | d1a7271ea1272e0f9775d49e6a84ee49819e0094 (diff) | |
| parent | fab10b643eb1a2038fb31305f0b038b7a9a8554d (diff) | |
| download | bootstrap-c8614c0f15f0ce78426c6403e57aff22c3ce2beb.tar.xz bootstrap-c8614c0f15f0ce78426c6403e57aff22c3ce2beb.zip | |
Merge branch 'master' into pr/12490
Conflicts:
less/list-group.less
Diffstat (limited to 'browserstack.json')
| -rw-r--r-- | browserstack.json | 44 |
1 files changed, 0 insertions, 44 deletions
diff --git a/browserstack.json b/browserstack.json deleted file mode 100644 index beab742e1..000000000 --- a/browserstack.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "username": "--secure--", - "key": "--secure--", - "test_path": "js/tests/index.html", - "debug": true, - "browsers": [ - { - "browser": "firefox", - "browser_version": "latest", - "os": "OS X", - "os_version": "Mavericks" - }, - { - "browser": "safari", - "browser_version": "latest", - "os": "OS X", - "os_version": "Mavericks" - }, - { - "browser": "chrome", - "browser_version": "latest", - "os": "OS X", - "os_version": "Mavericks" - }, - { - "browser": "firefox", - "browser_version": "latest", - "os": "Windows", - "os_version": "8.1" - }, - { - "browser": "chrome", - "browser_version": "latest", - "os": "Windows", - "os_version": "8.1" - }, - { - "browser": "Mobile Safari", - "os": "ios", - "os_version": "7.0", - "device": "iPhone 5S" - } - ] -} |