]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch '3.0.0-wip' of https://github.com/psylabs/bootstrap into psylabs-3.0...
authorMark Otto <otto@github.com>
Tue, 26 Mar 2013 19:28:00 +0000 (12:28 -0700)
committerMark Otto <otto@github.com>
Tue, 26 Mar 2013 19:28:00 +0000 (12:28 -0700)
commit954dcc0dc50212bc19a2789beb8d3c02214a198d
treeeb4c4af730b1ff509f49dde27e1717134e10fbea
parent3c82ccaa2bf7738b41f8805232f3a96aec522655
parentab09fb25b9b56cc9d02091697f59551c0cc0482d
Merge branch '3.0.0-wip' of https://github.com/psylabs/bootstrap into psylabs-3.0.0-wip

Conflicts:
less/tests/navbar-fixed-top.html
less/tests/navbar-static-top.html
less/tests/navbar.html
docs/javascript.html