diff options
| author | fat <jacobthornton@gmail.com> | 2012-12-22 08:20:04 +0400 |
|---|---|---|
| committer | fat <jacobthornton@gmail.com> | 2012-12-22 08:20:04 +0400 |
| commit | f59bf470810c3be7867f6212bb0f20b97509d800 (patch) | |
| tree | 24bfee88bc720998214c1ffe313920b3e0d33375 /docs | |
| parent | ddd59f22c7d6e3df7f7e427febc1d08035e0ec8b (diff) | |
| parent | 7f7039321d9078ff7127b56aabe6be0e85716350 (diff) | |
Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/assets/img/bootstrap-docs-readme.png | bin | 0 -> 30612 bytes | |||
| -rw-r--r-- | docs/examples/carousel.html | 1 |
2 files changed, 1 insertions, 0 deletions
diff --git a/docs/assets/img/bootstrap-docs-readme.png b/docs/assets/img/bootstrap-docs-readme.png Binary files differnew file mode 100644 index 0000000000..36603bd3b4 --- /dev/null +++ b/docs/assets/img/bootstrap-docs-readme.png diff --git a/docs/examples/carousel.html b/docs/examples/carousel.html index 0958103fc6..2a0cadec1a 100644 --- a/docs/examples/carousel.html +++ b/docs/examples/carousel.html @@ -448,5 +448,6 @@ }) }(window.jQuery) </script> + <script src="../assets/js/holder/holder.js"></script> </body> </html> |
