]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch '3.0.0-wip' into bs3_homepage
authorMark Otto <otto@github.com>
Mon, 19 Aug 2013 02:02:42 +0000 (19:02 -0700)
committerMark Otto <otto@github.com>
Mon, 19 Aug 2013 02:02:42 +0000 (19:02 -0700)
commit9dcae610e97c5422652d7212fda5985de1653d4c
tree03f5f15fb5d3a1561f69ce97a1a9f651e816330c
parent578a14e14aa7c6ad37f307d5d78e9a2afb0e7bfb
parent5bd2d7ed7e5a2bae56de81bf550f2e4b1451ab25
Merge branch '3.0.0-wip' into bs3_homepage

Conflicts:
customize.html
examples/justified-nav/justified-nav.css
_config.yml
_layouts/home.html
css.html
customize.html
examples/justified-nav/justified-nav.css
getting-started.html