]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
authorMark Otto <otto@github.com>
Wed, 24 Jul 2013 23:53:34 +0000 (16:53 -0700)
committerMark Otto <otto@github.com>
Wed, 24 Jul 2013 23:53:34 +0000 (16:53 -0700)
commit1f40da9676d0e29329fcf0925409a70acd02daaf
tree9e2026d88d888e45276806161eda13b608e0c7a0
parent51de38e5b9f1df43e56166cea979b18108e98350
parenta36f444c2567032b200ca36bee006c6e05a0b2c8
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip

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