]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
authorMark Otto <otto@github.com>
Sat, 27 Jul 2013 02:26:58 +0000 (19:26 -0700)
committerMark Otto <otto@github.com>
Sat, 27 Jul 2013 02:26:58 +0000 (19:26 -0700)
1  2 
_layouts/default.html

Simple merge