]> 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>
Thu, 18 Jul 2013 06:34:31 +0000 (23:34 -0700)
committerMark Otto <otto@github.com>
Thu, 18 Jul 2013 06:34:31 +0000 (23:34 -0700)
commit4d73aa60f953e0cb6c3b871d11a5c95617d0ca5b
tree34e6536894ccc1a1fdd8d9a7d66c1a9b59e2b363
parentd3a139622e50a5bbb29255eaca701d815dee716b
parent59f847e8eef64c4adbc57a682ad626e068370b30
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip

Conflicts:
docs/assets/js/bootstrap.min.js