]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch 'master' into bg-variant
authorMark Otto <otto@github.com>
Sat, 18 Jan 2014 22:40:17 +0000 (14:40 -0800)
committerMark Otto <otto@github.com>
Sat, 18 Jan 2014 22:40:17 +0000 (14:40 -0800)
commit3b6ab5075e881f6486145f2b3aea22bf53ee44e7
treec86ff1bb0d1715544241e35371541877e301e25e
parentcd1bea0616a8fb1b94d8021bc8dbc0cbc2eaf4aa
parent572e6a959aba6fa905c6377b900566b7ecc7c8f4
Merge branch 'master' into bg-variant

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