]> 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>
Thu, 22 Dec 2011 00:39:02 +0000 (18:39 -0600)
committerMark Otto <markdotto@gmail.com>
Thu, 22 Dec 2011 00:39:02 +0000 (18:39 -0600)
commit9fb380151d477f1741b7609ade7a9e7fd5450b2c
treea749f2b6917c09770af1586ae9f83e46115de7eb
parent12a0d69454a2831031035d19237d36d38bb2c2a9
parenta5a98a8a984512011dac1216b432b86c6eff96a4
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip

Conflicts:
bootstrap.css
docs/javascript.html
bootstrap.css
bootstrap.min.css
docs/assets/js/application.js
docs/javascript.html