]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch '2.2.2-wip' into exploratory
authorMark Otto <otto@github.com>
Sun, 4 Nov 2012 20:42:00 +0000 (12:42 -0800)
committerMark Otto <otto@github.com>
Sun, 4 Nov 2012 20:42:00 +0000 (12:42 -0800)
commit1af0021014a1c50ac02facd23a36dfc8f74cd143
treeef31a032f6561d4d0276dac48f77c4e2c6eb448b
parent508cc1fef4e11b2f985bff5bd663449676d10b0e
parent22d1506d2325f432dfd35c8380b06f19b8f74441
Merge branch '2.2.2-wip' into exploratory

Conflicts:
docs/assets/css/bootstrap.css
less/type.less
docs/assets/css/bootstrap.css
less/type.less