]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch '3.0.0-wip' into bs3_theme
authorMark Otto <otto@github.com>
Wed, 7 Aug 2013 01:29:54 +0000 (18:29 -0700)
committerMark Otto <otto@github.com>
Wed, 7 Aug 2013 01:29:54 +0000 (18:29 -0700)
commit402dbfb6171e18aa44e19429e796169f02b0adf7
treeaeb0cef7cc1b04988307a0ef79b07fbe2d7d197c
parent7e19b6b02ccd5417a6c2d3d418c08219773f1112
parent41bdd1a4823feb8b46b2fccfeec3e9c5057a0665
Merge branch '3.0.0-wip' into bs3_theme

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