Commit b0780507 authored by Mark Otto's avatar Mark Otto

Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip

Conflicts:
	docs/assets/bootstrap.zip
parents 0301d469 90f2e8e1
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment