diff options
| author | Pierre-Denis Vanduynslager <[email protected]> | 2017-01-04 12:22:06 -0500 |
|---|---|---|
| committer | Pierre-Denis Vanduynslager <[email protected]> | 2017-01-04 12:22:06 -0500 |
| commit | c4867cfedb6235708967aa8518c59ffed2816f0b (patch) | |
| tree | c7be6d18ee7c7a61f319bccacc035b9952171db1 /js/tests/visual/collapse.html | |
| parent | 425d156df27fa6c18e979aa000bfe5a346ee3450 (diff) | |
| parent | 1b194c06607f6cc3d087d25d6d49e1698771f3a1 (diff) | |
| download | bootstrap-c4867cfedb6235708967aa8518c59ffed2816f0b.tar.xz bootstrap-c4867cfedb6235708967aa8518c59ffed2816f0b.zip | |
Merge branch 'twbs/v4-dev' into dropdown-keyboard
# Conflicts:
# js/src/dropdown.js
Diffstat (limited to 'js/tests/visual/collapse.html')
| -rw-r--r-- | js/tests/visual/collapse.html | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/js/tests/visual/collapse.html b/js/tests/visual/collapse.html index 47ac06fd2..d16a1b0f2 100644 --- a/js/tests/visual/collapse.html +++ b/js/tests/visual/collapse.html @@ -3,7 +3,6 @@ <head> <meta charset="utf-8"> <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"> - <meta http-equiv="x-ua-compatible" content="ie=edge"> <link rel="stylesheet" href="../../../dist/css/bootstrap.min.css"> <title>Collapse</title> </head> @@ -58,7 +57,7 @@ </div> </div> - <script src="../vendor/jquery.min.js"></script> + <script src="../../../docs/assets/js/vendor/jquery-slim.min.js"></script> <script src="../../dist/util.js"></script> <script src="../../dist/collapse.js"></script> <script> |