]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
authorfat <jacobthornton@gmail.com>
Sun, 18 Aug 2013 01:41:51 +0000 (18:41 -0700)
committerfat <jacobthornton@gmail.com>
Sun, 18 Aug 2013 01:41:51 +0000 (18:41 -0700)
1  2 
customize.html

diff --cc customize.html
Simple merge