]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
authorMark Otto <otto@github.com>
Thu, 14 Mar 2013 20:25:59 +0000 (13:25 -0700)
committerMark Otto <otto@github.com>
Thu, 14 Mar 2013 20:25:59 +0000 (13:25 -0700)
commit00169b48bd69ee0e203cfb557de99887811b924e
tree7e35a8d20e9c6502b4f9b6b66b9acc27e7e42588
parentd219b8b96479f3390f37a6d14f1ee3fc12192221
parent7bff231ea5263796bbe948da6aa996bac3a9136b
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip

Conflicts:
less/grid.less
less/forms.less
less/grid.less