]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
projects / thirdparty / bootstrap.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: fe767a1 ef68cf8)
Merge branch '3.0.0-navbar-default' of https://github.com/juthilo/bootstrap-wip into...
authorMark Otto <otto@github.com>
Sun, 18 Aug 2013 22:43:27 +0000 (15:43 -0700)
committerMark Otto <otto@github.com>
Sun, 18 Aug 2013 22:43:27 +0000 (15:43 -0700)
commit7b4e2a9a4a9c3d6dc2298bb7a4cbfd9d86ac32fa
tree55e084b792818900f4db658e60d8ff699e80c4adtree
parentfe767a18d369080df509377e049b616c0c572dcccommit | diff
parentef68cf8ebdabccfa4bb9126acdc79f0510b04537commit | diff
Merge branch '3.0.0-navbar-default' of https://github.com/juthilo/bootstrap-wip into juthilo-3.0.0-navbar-default

Conflicts:
dist/css/bootstrap.min.css
components.html diff1 | diff2 | blob | history
dist/css/bootstrap.css diff1 | diff2 | blob | history
dist/css/bootstrap.min.css diff1 | diff2 | blob | history
Mirror of https://github.com/twbs/bootstrap.git