diff options
| author | Mark Otto <[email protected]> | 2014-07-07 22:10:22 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-07-07 22:10:22 -0700 |
| commit | 81b59d35368bc51d361d0352cc92fe99dc580fbf (patch) | |
| tree | 2395d5e79edaaa8c0a7ad82e99931ec895421532 /docs/javascript.html | |
| parent | fed2b0f7eb78438eb1b768782b04651881d88740 (diff) | |
| parent | ddee04038f946ac103eb4e70c8eb7adeb2cf563b (diff) | |
| download | bootstrap-81b59d35368bc51d361d0352cc92fe99dc580fbf.tar.xz bootstrap-81b59d35368bc51d361d0352cc92fe99dc580fbf.zip | |
Merge branch 'master' into derp
Conflicts:
docs/_layouts/default.html
docs/assets/css/docs.min.css
docs/assets/css/src/docs.css
docs/assets/js/docs.min.js
docs/assets/js/src/application.js
Diffstat (limited to 'docs/javascript.html')
| -rw-r--r-- | docs/javascript.html | 1 |
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 %} |