]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
authorMark Otto <otto@github.com>
Mon, 12 Aug 2013 03:45:42 +0000 (20:45 -0700)
committerMark Otto <otto@github.com>
Mon, 12 Aug 2013 03:45:42 +0000 (20:45 -0700)
commitc52a3508c616da928622bdfc930e2e11741a65e2
treec9a001864815a7c62dff888aecf5de9b60015a1f
parent2ae8be3b316137fe63f5979480bdb731ed2b8c24
parentf47a1905e2847e528d982fbd454b2b8c8ce900bb
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip

Conflicts:
dist/css/bootstrap.min.css
customize.html
dist/css/bootstrap.css
dist/css/bootstrap.min.css