diff options
| author | Mark Otto <[email protected]> | 2014-01-14 21:45:10 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-01-14 21:45:10 -0800 |
| commit | b93ce03f19079aaf977125ba27318df0107057eb (patch) | |
| tree | d9aaaee15e4d9ae2dd990de756d757acf38f37e3 /js | |
| parent | 413c8a6da533c59bb9a923901b5358ddb61564a5 (diff) | |
| parent | 5ead87d519682c68b18bf796273da70a32b68a96 (diff) | |
| download | bootstrap-b93ce03f19079aaf977125ba27318df0107057eb.tar.xz bootstrap-b93ce03f19079aaf977125ba27318df0107057eb.zip | |
Merge branch 'master' of github.com:twbs/bootstrap
Conflicts:
docs/assets/js/customize.min.js
Diffstat (limited to 'js')
| -rw-r--r-- | js/tests/index.html | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/js/tests/index.html b/js/tests/index.html index 4e3d487db..2983a0042 100644 --- a/js/tests/index.html +++ b/js/tests/index.html @@ -4,12 +4,17 @@ <title>Bootstrap Plugin Test Suite</title> <!-- jquery --> - <!--<script src="http://code.jquery.com/jquery-1.7.min.js"></script>--> <script src="vendor/jquery.js"></script> <!-- qunit --> <link rel="stylesheet" href="vendor/qunit.css" media="screen"> <script src="vendor/qunit.js"></script> + <script> + // See https://github.com/axemclion/grunt-saucelabs#test-result-details-with-qunit + QUnit.done(function(results) { + window.global_test_results = results + }) + </script> <!-- plugin sources --> <script src="../../js/transition.js"></script> |