]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch '3.0.0-wip' of https://github.com/jharbert/bootstrap into jharbert-3...
authorMark Otto <otto@github.com>
Wed, 14 Aug 2013 22:19:57 +0000 (15:19 -0700)
committerMark Otto <otto@github.com>
Wed, 14 Aug 2013 22:19:57 +0000 (15:19 -0700)
commit48bcf8164617772f7b14df298a045a409720f057
treeeaab63c2b0d0e253c3ef86da10695d9c7af2af3d
parent2002045b7f3acc0cacf1454d31f5bfc5d7e8968f
parent09e1f69d3e5c7b2f8d68e757701d48811c1a0b65
Merge branch '3.0.0-wip' of https://github.com/jharbert/bootstrap into jharbert-3.0.0-wip

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