]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
projects / thirdparty / bootstrap.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 92e7f16 41ad16f)
Merge branch '2.1.2-wip' of github.com:twitter/bootstrap into 2.1.2-wip
authorfat <jacobthornton@gmail.com>
Tue, 30 Oct 2012 04:28:17 +0000 (21:28 -0700)
committerfat <jacobthornton@gmail.com>
Tue, 30 Oct 2012 04:28:17 +0000 (21:28 -0700)
Conflicts:
bootstrap/css/bootstrap.css
bootstrap/css/bootstrap.min.css

1  2 
Makefile patch | diff1 | diff2 | blob | history

diff --cc Makefile
Simple merge
Mirror of https://github.com/twbs/bootstrap.git