diff options
| author | Jacob Thornton <[email protected]> | 2012-10-17 23:05:16 -0700 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2012-10-17 23:05:16 -0700 |
| commit | 7f3b94c45315475a129ace3c22e122808c2dbcaa (patch) | |
| tree | 0b963ce17c8bd8c5f43356da36015daee7295ede /docs/base-css.html | |
| parent | 280d4aeb30aa6b29ec74bd801ad1be3fc05e01f4 (diff) | |
| parent | e1f6458e3640a628cdb6b2e4c63950777d46e141 (diff) | |
| download | bootstrap-7f3b94c45315475a129ace3c22e122808c2dbcaa.tar.xz bootstrap-7f3b94c45315475a129ace3c22e122808c2dbcaa.zip | |
Merge branch 'delegate-api-to-document' of git://github.com/badcarl/bootstrap into badcarl-delegate-api-to-document
Conflicts:
js/bootstrap-carousel.js
Diffstat (limited to 'docs/base-css.html')
0 files changed, 0 insertions, 0 deletions