]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch 'master' into typography-example-updates
authorMark Otto <otto@github.com>
Fri, 7 Mar 2014 09:10:16 +0000 (01:10 -0800)
committerMark Otto <otto@github.com>
Fri, 7 Mar 2014 09:10:16 +0000 (01:10 -0800)
commite25dacba149e23490da0028954be4ec3c1ded8a3
tree86bf3c2e884f10e53f50ecb1f74e08f27ab84e65
parentd1d5d9041365c92b5e5577d2133a26fe509223e8
parentac4dd304604af590debd75f942b6f247c47321f5
Merge branch 'master' into typography-example-updates

Conflicts:
docs/assets/js/customize.min.js
docs/assets/js/customize.min.js