diff options
| author | Mark Otto <[email protected]> | 2012-02-01 16:45:25 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-02-01 16:45:25 -0800 |
| commit | f166c5a35b9a037fa0e314ce111812f4b7ef741e (patch) | |
| tree | 0db9a2a3729291a6c2c57fcbc27105e3b81e9174 /docs/components.html | |
| parent | 9b9e1d309bada7983434b092b40b088147a42a2e (diff) | |
| parent | 87df2304083b7e2da0cc0d43e77a1199948fb3e3 (diff) | |
| download | bootstrap-f166c5a35b9a037fa0e314ce111812f4b7ef741e.tar.xz bootstrap-f166c5a35b9a037fa0e314ce111812f4b7ef741e.zip | |
Merge branch 'master' of github.com:twitter/bootstrap
Conflicts:
docs/assets/bootstrap.zip
Diffstat (limited to 'docs/components.html')
| -rw-r--r-- | docs/components.html | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/docs/components.html b/docs/components.html index 0ccbf512e..0951c23b8 100644 --- a/docs/components.html +++ b/docs/components.html @@ -1511,5 +1511,7 @@ <script src="assets/js/bootstrap-carousel.js"></script> <script src="assets/js/bootstrap-typeahead.js"></script> <script src="assets/js/application.js"></script> + + </body> </html> |