]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch 'master' into gradient-prefix-cleanup 11694/head
authorMark Otto <otto@github.com>
Thu, 5 Dec 2013 05:23:09 +0000 (21:23 -0800)
committerMark Otto <otto@github.com>
Thu, 5 Dec 2013 05:23:09 +0000 (21:23 -0800)
commitcf81cb60ef9e29fd5b97c7a7d213dbf80cad0be6
tree9d05ca6eb1fb77bb9b854d37c7ed5d178c02d0a9
parent3f1e4b92eefaee617115973eba98fc7cc0905ab8
parent8c5dc542a553d93d4ee26db176e515f5164be8a7
Merge branch 'master' into gradient-prefix-cleanup

Conflicts:
dist/css/bootstrap.min.css
docs-assets/js/raw-files.js
dist/css/bootstrap.css
dist/css/bootstrap.min.css
docs-assets/js/raw-files.js
less/mixins.less