]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
projects / thirdparty / bootstrap.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f59e4fd e0647e8)
Merge branch '3.0.0-wip' into bs3_makefile_separated_done 6968/head
authorMark Otto <otto@github.com>
Fri, 1 Mar 2013 21:53:21 +0000 (13:53 -0800)
committerMark Otto <otto@github.com>
Fri, 1 Mar 2013 21:53:21 +0000 (13:53 -0800)
Conflicts:
Makefile


Trivial merge
Mirror of https://github.com/twbs/bootstrap.git