]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
merge in and resolve conflicts
authorMark Otto <otto@github.com>
Thu, 3 Jul 2014 05:54:56 +0000 (22:54 -0700)
committerMark Otto <otto@github.com>
Thu, 3 Jul 2014 05:54:56 +0000 (22:54 -0700)
commitb4958aba69cd942271bba465d5cbc8ef4a1d0529
treecde2b0250d6ee371d553fdb9635d116bbeb89fe0
parent77c1a528ab48ba695f52f4f8f7b97bf7bbde05d1
merge in and resolve conflicts
dist/css/bootstrap.css
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
less/forms.less
less/mixins/forms.less