]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
projects / thirdparty / bootstrap.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: cb0fed6 c553290)
Merge branch '2.3.0-wip' of https://github.com/patrickhlauke/bootstrap into patrickhl...
authorMark Otto <otto@github.com>
Wed, 6 Feb 2013 03:39:49 +0000 (19:39 -0800)
committerMark Otto <otto@github.com>
Wed, 6 Feb 2013 03:39:49 +0000 (19:39 -0800)
commit15c7e73abd8d97f0139d177d05c94e26faa17dd2
tree5d9a2317d17b669fe4a9ce6863ea59f0ddeea430tree | snapshot
parentcb0fed66933d179b5bc3669a1df7df00b5688cbecommit | diff
parentc55329085ebc6d05d91412251331c0613ea2250bcommit | diff
Merge branch '2.3.0-wip' of https://github.com/patrickhlauke/bootstrap into patrickhlauke-2.3.0-wip

Conflicts:
docs/assets/css/bootstrap.css
less/navbar.less
docs/assets/css/bootstrap.css diff1 | diff2 | blob | history
docs/examples/fluid.html diff1 | diff2 | blob | history
docs/examples/hero.html diff1 | diff2 | blob | history
less/buttons.less diff1 | diff2 | blob | history
less/carousel.less diff1 | diff2 | blob | history
less/mixins.less diff1 | diff2 | blob | history
less/navbar.less diff1 | diff2 | blob | history
less/sprites.less diff1 | diff2 | blob | history
less/type.less diff1 | diff2 | blob | history
Mirror of https://github.com/twbs/bootstrap.git