]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch 'SBoudrias-patch-1' into 3.0.0-wip
authorMark Otto <otto@github.com>
Mon, 1 Apr 2013 01:39:49 +0000 (18:39 -0700)
committerMark Otto <otto@github.com>
Mon, 1 Apr 2013 01:39:49 +0000 (18:39 -0700)
commit8e59357bc56b57d1482847bff0706c12efb0039c
treef9fda4a61c30ed4dd07f8eafa8b6efe03c2eef0b
parentdb284a97d6b0d6eb20c3b6724440cbd26b80ccbd
parentcae90f30107773c7144278cd9517fdb8d69412e5
Merge branch 'SBoudrias-patch-1' into 3.0.0-wip

Conflicts:
less/type.less
less/type.less