aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Rebert <[email protected]>2014-04-19 18:43:09 -0700
committerChris Rebert <[email protected]>2014-04-19 18:43:09 -0700
commitefcd9604fa12047654c3c946a0bb0c92bafd17e5 (patch)
treee0a9cd7af385cf1845c70675ed6c28f4b8914b6a
parent0aaf2cdd3a715b08bd41197b361ecd2af99cba0b (diff)
parenta54e6d4ea96b4391cc3e597a6e9c0693c0d4d1fd (diff)
downloadbootstrap-efcd9604fa12047654c3c946a0bb0c92bafd17e5.tar.xz
bootstrap-efcd9604fa12047654c3c946a0bb0c92bafd17e5.zip
Merge pull request #13381 from twbs/vendor-jquery-min
rename jquery.js -> jquery.min.js since it's minified
-rw-r--r--js/tests/index.html2
-rw-r--r--js/tests/vendor/jquery.min.js (renamed from js/tests/vendor/jquery.js)0
2 files changed, 1 insertions, 1 deletions
diff --git a/js/tests/index.html b/js/tests/index.html
index 120ed933c..363ebe599 100644
--- a/js/tests/index.html
+++ b/js/tests/index.html
@@ -5,7 +5,7 @@
<title>Bootstrap Plugin Test Suite</title>
<!-- jQuery -->
- <script src="vendor/jquery.js"></script>
+ <script src="vendor/jquery.min.js"></script>
<!-- QUnit -->
<link rel="stylesheet" href="vendor/qunit.css" media="screen">
diff --git a/js/tests/vendor/jquery.js b/js/tests/vendor/jquery.min.js
index 73f33fb3a..73f33fb3a 100644
--- a/js/tests/vendor/jquery.js
+++ b/js/tests/vendor/jquery.min.js