diff options
| author | Jacob Thornton <[email protected]> | 2012-01-24 14:31:10 -0800 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2012-01-24 14:31:10 -0800 |
| commit | fbc1ab14cc7e591f4b2e53ef3fb25ef7dc243fce (patch) | |
| tree | 01e1f91f11aff4836d6623257387b68b76dd84bf /docs/components.html | |
| parent | a800d6ceac11eb834295567c20e890abf88c64af (diff) | |
| parent | fea1dc906e153440896a8c62d89fd2dfa7c39b9a (diff) | |
| download | bootstrap-fbc1ab14cc7e591f4b2e53ef3fb25ef7dc243fce.tar.xz bootstrap-fbc1ab14cc7e591f4b2e53ef3fb25ef7dc243fce.zip | |
Merge branch '2.0-wip' of https://github.com/MGaetan89/bootstrap into 2.0-wip
Conflicts:
docs/templates/pages/index.mustache
Diffstat (limited to 'docs/components.html')
0 files changed, 0 insertions, 0 deletions