]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
authorMark Otto <markdotto@gmail.com>
Mon, 30 Jan 2012 00:55:56 +0000 (16:55 -0800)
committerMark Otto <markdotto@gmail.com>
Mon, 30 Jan 2012 00:55:56 +0000 (16:55 -0800)
Conflicts:
docs/assets/bootstrap.zip

1  2 
docs/assets/bootstrap.zip

index c443972789f8bafb69e9e8e0fa9c49688b8717ed,099ed3b1a14e84b0434875e1fe9bc9d30f08f8cb..21df15cefa873548d274acc4d2c4abb09818e1af
Binary files differ