diff options
| author | Mark Otto <[email protected]> | 2013-08-18 10:28:32 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-08-18 10:28:32 -0700 |
| commit | f8b65b41ab0c1bc130c3ca521fb99214f5509568 (patch) | |
| tree | 0b117fe251e09d6917c5e777c4735574da127617 /examples/carousel | |
| parent | 6b24297c5beca5adc118d0524c50700928687c1c (diff) | |
| parent | 6496ffb7d4fc042983882af8dadce39b1d7affac (diff) | |
| download | bootstrap-f8b65b41ab0c1bc130c3ca521fb99214f5509568.tar.xz bootstrap-f8b65b41ab0c1bc130c3ca521fb99214f5509568.zip | |
Merge branch '3.0.0-wip' into bs3_restore_glyphicons
Conflicts:
dist/css/bootstrap.min.css
Diffstat (limited to 'examples/carousel')
0 files changed, 0 insertions, 0 deletions