diff options
| author | Mark Otto <[email protected]> | 2013-02-05 19:39:49 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-02-05 19:39:49 -0800 |
| commit | 0a8d834af61725a61ca7fbc917dd4ae1d36f0769 (patch) | |
| tree | ac34c3545a6d1ef2af5897e5d6c5df093293224a /carousel.html | |
| parent | cc58a65fa125f119af713db5d92413c093503ce4 (diff) | |
| parent | 034155ec215f3c6dadbc22939737de5184128756 (diff) | |
| download | bootstrap-0a8d834af61725a61ca7fbc917dd4ae1d36f0769.tar.xz bootstrap-0a8d834af61725a61ca7fbc917dd4ae1d36f0769.zip | |
Merge branch '2.3.0-wip' of https://github.com/patrickhlauke/bootstrap into patrickhlauke-2.3.0-wip
Conflicts:
docs/assets/css/bootstrap.css
less/navbar.less
Diffstat (limited to 'carousel.html')
0 files changed, 0 insertions, 0 deletions