]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch '2.0.3-wip' of github.com:twitter/bootstrap into 2.0.3-wip
authorMark Otto <markotto@twitter.com>
Sun, 8 Apr 2012 06:41:27 +0000 (23:41 -0700)
committerMark Otto <markotto@twitter.com>
Sun, 8 Apr 2012 06:41:27 +0000 (23:41 -0700)
commit48063afb3a53c762bb950e4246a06a3682707aed
tree204de2d2a54f959d12067a046859f445234d34e0
parent0b2d23d4439429cdbd0758d01f4602e6b2afde6d
parent08fee005a8a879498255611c18dede3112896d3d
Merge branch '2.0.3-wip' of github.com:twitter/bootstrap into 2.0.3-wip

Conflicts:
docs/assets/bootstrap.zip
docs/assets/bootstrap.zip