From: Mark Otto <otto@github.com>
Date: Thu, 20 Jun 2013 02:13:38 +0000 (-0700)
Subject: Merge branch 'offcanvas-example' of https://github.com/trumbitta/bootstrap into trumb... 
X-Git-Tag: v3.0.0-rc1~262
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b0bece66f295df37b0cf3e61267de17640640da8;p=thirdparty%2Fbootstrap.git

Merge branch 'offcanvas-example' of https://github.com/trumbitta/bootstrap into trumbitta-offcanvas-example
---

b0bece66f295df37b0cf3e61267de17640640da8
diff --cc docs/_includes/footer.html
index fcfc7c4828,81cd6f947c..19a9af6362
--- a/docs/_includes/footer.html
+++ b/docs/_includes/footer.html
@@@ -2,8 -2,24 +2,12 @@@
  ================================================== -->
  <!-- Placed at the end of the document so the pages load faster -->
  <script src="/assets/js/jquery.js"></script>
 -<script src="/assets/js/bootstrap-transition.js"></script>
 -<script src="/assets/js/bootstrap-alert.js"></script>
 -<script src="/assets/js/bootstrap-modal.js"></script>
 -<script src="/assets/js/bootstrap-dropdown.js"></script>
 -<script src="/assets/js/bootstrap-scrollspy.js"></script>
 -<script src="/assets/js/bootstrap-tab.js"></script>
 -<script src="/assets/js/bootstrap-tooltip.js"></script>
 -<script src="/assets/js/bootstrap-popover.js"></script>
 -<script src="/assets/js/bootstrap-button.js"></script>
 -<script src="/assets/js/bootstrap-collapse.js"></script>
 -<script src="/assets/js/bootstrap-carousel.js"></script>
 -<script src="/assets/js/bootstrap-typeahead.js"></script>
 -<script src="/assets/js/bootstrap-affix.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>