Skip to content

B
bootstrap
Commit 5ac2f304 authored by Mark Otto's avatar Mark Otto
Browse files
Options

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

Conflicts:
	docs/examples/sticky-footer-navbar.html
	docs/examples/sticky-footer.html
parents ae525258 dc09979b
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 0 deletions
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