mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-05-27 14:46:01 +03:00
Code Activity

Merge branch 'master' into v4m

Browse Source
This commit is contained in:
Mark Otto
2015-08-04 22:29:45 -07:00
parent 8ee9da2f54 ab412b2404
commit 1ddc3f5e21
42 changed files with 1101 additions and 1005 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/examples/carousel/index.html
+1
View File
@@ -178,6 +178,7 @@
================================================== -->
<!-- Placed at the end of the document so the pages load faster -->
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.min.js"></script>
<script>window.jQuery || document.write('<script src="../../assets/js/vendor/jquery.min.js"><\/script>')</script>
<script src="../../dist/js/bootstrap.min.js"></script>
<!-- Just to make our placeholder images work. Don't actually copy the next line! -->
<script src="../../assets/js/vendor/holder.min.js"></script>