diff options
| author | Mark Otto <[email protected]> | 2013-12-01 20:27:30 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-12-01 20:27:30 -0800 |
| commit | 4876cbeef8c79686ba31c3ed22771357d71dbe51 (patch) | |
| tree | 79fed0fbb2a96fad2247c3014a045e655d1a825e /browserstack.json | |
| parent | 1444a3ca638bd8661c0019560117ac75aace3402 (diff) | |
| parent | 561aff7942d9adfc9508232789e2598406f80934 (diff) | |
| download | bootstrap-4876cbeef8c79686ba31c3ed22771357d71dbe51.tar.xz bootstrap-4876cbeef8c79686ba31c3ed22771357d71dbe51.zip | |
Merge branch 'master' into pr/11412
Conflicts:
dist/js/bootstrap.min.js
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", |