]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
projects / thirdparty / bootstrap.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: e23b7ec 1583dd5)
Merge branch '3.0.0-wip-fixed-grid-push-pull-offset' of https://github.com/jtickle...
authorMark Otto <otto@github.com>
Fri, 2 Aug 2013 20:58:06 +0000 (13:58 -0700)
committerMark Otto <otto@github.com>
Fri, 2 Aug 2013 20:58:06 +0000 (13:58 -0700)
commit83eea13e6395d414a3c297c24b7f0f5dd7d7acce
treeec7987e2b55a92c0ce56f2bf6674ed46c73c2a3etree
parente23b7ec20e672e7878ef235c751f3ab3fe793140commit | diff
parent1583dd55e9f05275ee054884720dce2be8e2f07acommit | diff
Merge branch '3.0.0-wip-fixed-grid-push-pull-offset' of https://github.com/jtickle/fp-bootstrap into jtickle-3.0.0-wip-fixed-grid-push-pull-offset

Conflicts:
dist/css/bootstrap.min.css
css.html diff1 | diff2 | blob | history
dist/css/bootstrap.css diff1 | diff2 | blob | history
dist/css/bootstrap.min.css diff1 | diff2 | blob | history
Mirror of https://github.com/twbs/bootstrap.git