]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
projects / thirdparty / bootstrap.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 869f113 f285048)
Merge branch 'master' of https://github.com/twitter/bootstrap into dev
authorJacob Thornton <jacobthornton@gmail.com>
Fri, 4 Nov 2011 00:06:13 +0000 (17:06 -0700)
committerJacob Thornton <jacobthornton@gmail.com>
Fri, 4 Nov 2011 00:06:13 +0000 (17:06 -0700)
1  2 
Makefile patch | diff1 | diff2 | blob | history

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