diff options
| author | Mark Otto <[email protected]> | 2013-10-13 18:32:34 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-10-13 18:32:34 -0700 |
| commit | 265fda7903e189ee0d2d7201cc92bf384fc53043 (patch) | |
| tree | cf2249e0696d6ea2923678f9f7b155e265756f03 /_includes/footer.html | |
| parent | a46003b8c7cc20bf4f72b7638a74643353ae047f (diff) | |
| parent | 727a91de1cdf5cbc4f25528e073480332a5940c5 (diff) | |
| download | bootstrap-265fda7903e189ee0d2d7201cc92bf384fc53043.tar.xz bootstrap-265fda7903e189ee0d2d7201cc92bf384fc53043.zip | |
Merge branch 'master' into restore_grid_mixins
Conflicts:
dist/css/bootstrap.min.css
Diffstat (limited to '_includes/footer.html')
| -rw-r--r-- | _includes/footer.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/_includes/footer.html b/_includes/footer.html index 9e66c58a1..7f9f8f103 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -1,7 +1,7 @@ <!-- Bootstrap core JavaScript ================================================== --> <!-- Placed at the end of the document so the pages load faster --> -<script src="{{ page.base_url }}docs-assets/js/jquery.js"></script> +<script src="https://code.jquery.com/jquery-1.10.2.min.js"></script> <script src="{{ page.base_url }}dist/js/bootstrap.js"></script> <script src="http://platform.twitter.com/widgets.js"></script> |