]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch 'master' into fix-12154
authorMark Otto <otto@github.com>
Sun, 9 Feb 2014 00:52:22 +0000 (16:52 -0800)
committerMark Otto <otto@github.com>
Sun, 9 Feb 2014 00:52:22 +0000 (16:52 -0800)
commite9199718d64dadc22d61b4cea8c77a2307455823
treeb10f0174a9d564da40df55d658136fef74b6adb9
parent4787a69efbe0fcd81228781b3c91dfe198aa0f1b
parent7f88009394e72395aa7a458ae442b0c3037dbd15
Merge branch 'master' into fix-12154

Conflicts:
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
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