]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
authorJacob Thornton <jacobthornton@gmail.com>
Tue, 31 Jan 2012 21:59:08 +0000 (13:59 -0800)
committerJacob Thornton <jacobthornton@gmail.com>
Tue, 31 Jan 2012 21:59:08 +0000 (13:59 -0800)
commite75bc5eb5ffca534fd3a84d749e8b39824654ebb
tree489c4b5428bb074b96f9b4fbc28abd1f6164ff1c
parent390a9af936ce6350bec2660b579e3dcab5918fdb
parentaec0cb3303eaa6952e08227bed505f8b6527caad
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip

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