Commit 8eef0a47 authored by Mark Otto's avatar Mark Otto

Merge branch 'master' of github.com:twbs/bootstrap

parents 380019cc bd8ef990
...@@ -3,29 +3,26 @@ ...@@ -3,29 +3,26 @@
{ {
browserName: "safari", browserName: "safari",
platform: "OS X 10.8" platform: "OS X 10.9"
}, },
# { # Safari 7 (which requires Mavericks) is not currently supported by Sauce Labs # FIXME: keeps timing out frequently for unknown reasons
# browserName: "safari", # {
# browserName: "chrome",
# platform: "OS X 10.9" # platform: "OS X 10.9"
# }, # },
{ {
browserName: "chrome", browserName: "firefox",
platform: "OS X 10.9" platform: "OS X 10.9"
}, },
# { # FIXME: currently fails 1 tooltip test
# browserName: "firefox",
# platform: "OS X 10.9"
# },
# Mac Opera not currently supported by Sauce Labs # Mac Opera not currently supported by Sauce Labs
# { # FIXME: currently fails 1 tooltip test {
# browserName: "internet explorer", browserName: "internet explorer",
# version: "11", version: "11",
# platform: "Windows 8.1" platform: "Windows 8.1"
# }, },
# { # {
# browserName: "internet explorer", # browserName: "internet explorer",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment