]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch 'master' into pr/10656
authorMark Otto <otto@github.com>
Mon, 21 Oct 2013 05:55:45 +0000 (22:55 -0700)
committerMark Otto <otto@github.com>
Mon, 21 Oct 2013 05:55:45 +0000 (22:55 -0700)
commit2eec3f919e7bd7ee847c2631ae9c53515cac1c8f
treeb9dd9c6b61fcb72aafe47dd85beac8cfb9da4fe2
parentab3d0a27b3d93eebff3852728f94ddc4fcb35199
parent6585c5898a47deb2df5f7db4f9ef3fe8fa1e5a4a
Merge branch 'master' into pr/10656

Conflicts:
dist/css/bootstrap.min.css
dist/css/bootstrap.css
dist/css/bootstrap.min.css
less/mixins.less
less/panels.less