]> 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, 19 Aug 2013 06:52:22 +0000 (23:52 -0700)
committerMark Otto <otto@github.com>
Mon, 19 Aug 2013 06:52:22 +0000 (23:52 -0700)
commitf7a7cb479fa53b38524f2f79cac262a0736be97b
treeef2122dae6256521b6c113a055ec2a4920f6092e
parent7dcfc44426dc7c294c2c0cb6b0469c3db1baa485
parentc0f477a1075321614db8a628fb0046207b5f455b
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip

Conflicts:
getting-started.html
assets/js/customizer.js
getting-started.html