diff options
| author | Mark Otto <[email protected]> | 2013-11-28 15:55:17 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-11-28 15:55:17 -0800 |
| commit | b5f9cc20578fb57b2b69e10cf32bba55f9c940e4 (patch) | |
| tree | 72b6c245b35c2c6783bc43d4add6ce0e1e65b801 /browserstack.json | |
| parent | 0da3901ed5a6d498af8b7c76b61d004a003f716b (diff) | |
| parent | 0be94180b99cec9be239124c666721e40fbfbc97 (diff) | |
| download | bootstrap-b5f9cc20578fb57b2b69e10cf32bba55f9c940e4.tar.xz bootstrap-b5f9cc20578fb57b2b69e10cf32bba55f9c940e4.zip | |
Merge branch 'master' into pr/11414
Conflicts:
dist/css/bootstrap.min.css
Diffstat (limited to 'browserstack.json')
| -rw-r--r-- | browserstack.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/browserstack.json b/browserstack.json index 76564eb27..104d85476 100644 --- a/browserstack.json +++ b/browserstack.json @@ -2,7 +2,7 @@ "username": "--secure--", "key": "--secure--", "test_path": "js/tests/index.html", - "browsers": [ + "browsers": [ { "browser": "firefox", "browser_version": "latest", |