]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch 'master' into drop_recess_for_less
authorMark Otto <otto@github.com>
Mon, 9 Dec 2013 07:00:01 +0000 (23:00 -0800)
committerMark Otto <otto@github.com>
Mon, 9 Dec 2013 07:00:01 +0000 (23:00 -0800)
commit2a4621b71f3440fac06f519fe9a0e61d4418dbe6
tree4ceb9dcc9e1c5040ca06fecdb8b65d0986dc4c8a
parente4c1ef7c6d64696bc7ef367f8fd4f7c47b4c696a
parent6df909ad9b85e5e19ff7760da8981bf7563a5bb9
Merge branch 'master' into drop_recess_for_less

Conflicts:
dist/css/bootstrap.min.css
dist/css/bootstrap.css
dist/css/bootstrap.min.css