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

Browse Source

Conflicts:
	docs/examples/sticky-footer-navbar.html
	docs/examples/sticky-footer.html

...

This commit is contained in:

Mark Otto

2013-02-14 23:44:50 -08:00

parent ae525258af dc09979b51

commit 5ac2f304a8

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available