]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
authorMark Otto <otto@github.com>
Tue, 23 Jul 2013 17:19:04 +0000 (10:19 -0700)
committerMark Otto <otto@github.com>
Tue, 23 Jul 2013 17:19:04 +0000 (10:19 -0700)
commitb5f2482a58891c52cbf46c2419f883a519577bd3
tree8e1a8383144258a4c11697f9d95f4b81d36392b4
parent8aa3c375f061edf2df044f22b9416bb8dda80850
parente7b0f4e81f0930bbafc85e25d22d06c5e924f095
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip

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