]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch 'patch-3' of https://github.com/jholl/bootstrap into jholl-patch-3
authorMark Otto <otto@github.com>
Fri, 26 Jul 2013 22:08:45 +0000 (15:08 -0700)
committerMark Otto <otto@github.com>
Fri, 26 Jul 2013 22:08:45 +0000 (15:08 -0700)
commit1cf0a07f174261e8ee05cfd294d5147e27e22d40
tree70588783a119ebd9871335449b7fbc029445396b
parent444973e54d56b7d722978ea398f2910fbbfe6b69
parent2e7593a40dfc6149e81044325c6ad866dcbfa8a8
Merge branch 'patch-3' of https://github.com/jholl/bootstrap into jholl-patch-3

Conflicts:
css.html
css.html
less/forms.less