diff options
| author | Mark Otto <[email protected]> | 2013-07-17 20:44:27 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-07-17 20:44:27 -0700 |
| commit | f0d071832284d968f2cb72b0bb576f8112a349de (patch) | |
| tree | 9766c8da2b7c6890cdc794a2d93d4ca81c191047 /docs/_includes/footer.html | |
| parent | c5fb401a626c3e0d99a764cb7961e1bd3e619e8f (diff) | |
| parent | bfebf0e490c795601220f74b7089adb4f47acda7 (diff) | |
| download | bootstrap-f0d071832284d968f2cb72b0bb576f8112a349de.tar.xz bootstrap-f0d071832284d968f2cb72b0bb576f8112a349de.zip | |
Merge branch '3.0.0-wip' into bs3_remove_examples
Conflicts:
docs/_includes/nav-getting-started.html
docs/examples/navbar-fixed-top.html
docs/examples/navbar-static-top.html
docs/examples/navbar.html
docs/getting-started.html
Diffstat (limited to 'docs/_includes/footer.html')
| -rw-r--r-- | docs/_includes/footer.html | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/docs/_includes/footer.html b/docs/_includes/footer.html index 19a9af636..fcfc7c482 100644 --- a/docs/_includes/footer.html +++ b/docs/_includes/footer.html @@ -4,10 +4,6 @@ <script src="/assets/js/jquery.js"></script> <script src="/assets/js/bootstrap.js"></script> -<!-- Offcanvas example -================================================== --> -<script src="/assets/js/examples/bootstrap-offcanvas.js"></script> - <script type="text/javascript" src="http://platform.twitter.com/widgets.js"></script> <script src="/assets/js/holder/holder.js"></script> |