]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch 'pr/11778' into drop_recess_for_less
authorMark Otto <otto@github.com>
Mon, 9 Dec 2013 07:48:07 +0000 (23:48 -0800)
committerMark Otto <otto@github.com>
Mon, 9 Dec 2013 07:48:07 +0000 (23:48 -0800)
commitea61a19a04e3bcd96f1dc0960375d926bb1dabb5
tree4d3f573abfa96ed0465492f52d70d7e2b6e767a8
parent0016c17f9307bc71fc96d8d4680a9c861f137cae
parentfdc5d1dc34bf28e55c6359aeb098e608585ca6cb
Merge branch 'pr/11778' into drop_recess_for_less

Conflicts:
Gruntfile.js
dist/css/bootstrap-theme.min.css
dist/css/bootstrap.min.css
Gruntfile.js
dist/css/bootstrap-theme.min.css
dist/css/bootstrap.min.css
package.json