]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
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)
commit1f160d4c12e2801d5ede245099d74386f91214a8
tree5984bee820ad1f6eec6db7de511f1ad46fb51a45
parentf59e4fdba32b99bdd4e6387f889dda4c9270f762
parente0647e8273aee5bd09d5461f6f974e36b3d0c3c9
Merge branch '3.0.0-wip' into bs3_makefile_separated_done

Conflicts:
Makefile