diff options
| author | Mark Otto <[email protected]> | 2013-10-20 22:55:45 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-10-20 22:55:45 -0700 |
| commit | 2eec3f919e7bd7ee847c2631ae9c53515cac1c8f (patch) | |
| tree | b9dd9c6b61fcb72aafe47dd85beac8cfb9da4fe2 /js/tests | |
| parent | ab3d0a27b3d93eebff3852728f94ddc4fcb35199 (diff) | |
| parent | 6585c5898a47deb2df5f7db4f9ef3fe8fa1e5a4a (diff) | |
| download | bootstrap-2eec3f919e7bd7ee847c2631ae9c53515cac1c8f.tar.xz bootstrap-2eec3f919e7bd7ee847c2631ae9c53515cac1c8f.zip | |
Merge branch 'master' into pr/10656
Conflicts:
dist/css/bootstrap.min.css
Diffstat (limited to 'js/tests')
| -rw-r--r-- | js/tests/index.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/tests/index.html b/js/tests/index.html index 501bf38f2..4e3d487db 100644 --- a/js/tests/index.html +++ b/js/tests/index.html @@ -8,7 +8,7 @@ <script src="vendor/jquery.js"></script> <!-- qunit --> - <link rel="stylesheet" href="vendor/qunit.css" type="text/css" media="screen" /> + <link rel="stylesheet" href="vendor/qunit.css" media="screen"> <script src="vendor/qunit.js"></script> <!-- plugin sources --> |