aboutsummaryrefslogtreecommitdiff
path: root/docs/javascript.html
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2014-03-24 19:30:17 -0700
committerMark Otto <[email protected]>2014-03-24 19:30:17 -0700
commit39fec66fc4cb529d05f2b116abedf1bb2bdb65a8 (patch)
tree55cdb65256a7313bfda85416a1c100c0adb62e40 /docs/javascript.html
parent4a2d337bf5f329eac1ca16208414ec1ebfe0546e (diff)
parent6f6bce5944bd0e6ab36ab6b39339f381d8a80b2a (diff)
downloadbootstrap-39fec66fc4cb529d05f2b116abedf1bb2bdb65a8.tar.xz
bootstrap-39fec66fc4cb529d05f2b116abedf1bb2bdb65a8.zip
Merge branch 'master' into fat-9461
Diffstat (limited to 'docs/javascript.html')
-rw-r--r--docs/javascript.html1
1 files changed, 1 insertions, 0 deletions
diff --git a/docs/javascript.html b/docs/javascript.html
index c7671c7ea..e6151cb27 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -13,6 +13,7 @@ lead: "Bring Bootstrap's components to life with over a dozen custom jQuery plug
{% include js/tabs.html %}
{% include js/tooltips.html %}
{% include js/popovers.html %}
+{% include js/alerts.html %}
{% include js/buttons.html %}
{% include js/collapse.html %}
{% include js/carousel.html %}