]> 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>
Fri, 10 May 2013 00:22:48 +0000 (17:22 -0700)
committerMark Otto <otto@github.com>
Fri, 10 May 2013 00:22:48 +0000 (17:22 -0700)
commit90e4ff73d25e426cf19bb84392510f78e2cd2fd8
treef170cd1ba77245303235a16ece2846686557ffbf
parenta19fda699daa56bb0e3fc1b9f3c48762cdab893f
parent1fdfee8de0e487f5d3710a94706e0a025d07919f
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip

Conflicts:
less/forms.less
docs/assets/css/bootstrap.css
less/forms.less