]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
authorMark Otto <markdotto@gmail.com>
Tue, 31 Jan 2012 22:30:07 +0000 (14:30 -0800)
committerMark Otto <markdotto@gmail.com>
Tue, 31 Jan 2012 22:30:07 +0000 (14:30 -0800)
commitc84b5cf5f52ad9be72adf9de2956baad1d6e025b
tree60c9078f26909fb48ad714d227f2bd0014060543
parent6cf79a5b8e13e8c1e2919da9e334cc6c9275ab9b
parent80a752f52508ed8c2405da233c667210ed1d5379
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip

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