]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge branch 'master' into deprecate_screen_containers 10125/head
authorMark Otto <otto@github.com>
Sun, 1 Sep 2013 07:33:11 +0000 (09:33 +0200)
committerMark Otto <otto@github.com>
Sun, 1 Sep 2013 07:33:11 +0000 (09:33 +0200)
1  2 
customize.html
less/variables.less

diff --cc customize.html
Simple merge
Simple merge