]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch '3.0.0-wip' into bs3_restore_glyphicons 9767/head
authorMark Otto <otto@github.com>
Sun, 18 Aug 2013 17:28:32 +0000 (10:28 -0700)
committerMark Otto <otto@github.com>
Sun, 18 Aug 2013 17:28:32 +0000 (10:28 -0700)
commitf8b65b41ab0c1bc130c3ca521fb99214f5509568
tree0b117fe251e09d6917c5e777c4735574da127617
parent6b24297c5beca5adc118d0524c50700928687c1c
parent6496ffb7d4fc042983882af8dadce39b1d7affac
Merge branch '3.0.0-wip' into bs3_restore_glyphicons

Conflicts:
dist/css/bootstrap.min.css
components.html
dist/css/bootstrap.css
dist/css/bootstrap.min.css