]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
authorfat <jacobthornton@gmail.com>
Sat, 17 Aug 2013 20:43:58 +0000 (13:43 -0700)
committerfat <jacobthornton@gmail.com>
Sat, 17 Aug 2013 20:43:58 +0000 (13:43 -0700)
commit728a5e17d667422cdad791e06375e8e9a0f80cc1
treefa1a70b54684f362584ecbc23be4b82487379261
parent53c80ed9cbeff8a3c58abe0f824ff68ef56d617a
parent0c70744ea22126b6224bde75b4ccb6068941e38f
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip

Conflicts:
dist/css/bootstrap.min.css