]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch 'master' into pr/11412
authorMark Otto <otto@github.com>
Mon, 2 Dec 2013 04:27:30 +0000 (20:27 -0800)
committerMark Otto <otto@github.com>
Mon, 2 Dec 2013 04:27:30 +0000 (20:27 -0800)
commit4876cbeef8c79686ba31c3ed22771357d71dbe51
tree79fed0fbb2a96fad2247c3014a045e655d1a825e
parent1444a3ca638bd8661c0019560117ac75aace3402
parent561aff7942d9adfc9508232789e2598406f80934
Merge branch 'master' into pr/11412

Conflicts:
dist/js/bootstrap.min.js
dist/css/bootstrap.css
dist/css/bootstrap.min.css
docs-assets/css/docs.css