]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch 'master' into responsive-visibility-table
authorMark Otto <otto@github.com>
Wed, 4 Dec 2013 06:58:25 +0000 (22:58 -0800)
committerMark Otto <otto@github.com>
Wed, 4 Dec 2013 06:58:25 +0000 (22:58 -0800)
commita42e9163cbf6dcdd72a004a4a7c2b787478e18b0
tree6ba50185884ca0a425d7185ac63949102d96002e
parent303f8a33c354b5c8f6132574de55114b8f39a1f1
parented0d556847a7a1168a05a6a71f8f1af23139327b
Merge branch 'master' into responsive-visibility-table

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