]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch '3.0.0-wip' into bs3_homepage
authorMark Otto <otto@github.com>
Mon, 19 Aug 2013 03:15:45 +0000 (20:15 -0700)
committerMark Otto <otto@github.com>
Mon, 19 Aug 2013 03:15:45 +0000 (20:15 -0700)
commita9378a92670f4bf5ccb753191af795c45bb64998
tree9690c9a1c123c3103a1f345015f93aac8b43e983
parentcf09e6a6b5e314f4f7433f21bd32287885c95451
parentf584500211af84038bcff9b363343eb02cda6ccd
Merge branch '3.0.0-wip' into bs3_homepage

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