]> 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>
Fri, 27 Jan 2012 22:49:02 +0000 (14:49 -0800)
committerMark Otto <markdotto@gmail.com>
Fri, 27 Jan 2012 22:49:02 +0000 (14:49 -0800)
commit91e9f6fa91ea2f6d8cc47b8dbf1428847ad6504f
treed4c8432b4cfc318603727726a512a7df24ca3dc9
parent22359f9dfdf5d513da163416005345649415b90f
parent065ed01b1f78a1e5d358b78304ef211d7b96f362
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip

Conflicts:
docs/assets/css/bootstrap.css
docs/assets/css/bootstrap.css