Merge branch '2.3.0-wip' of https://github.com/patrickhlauke/bootstrap into patrickhlauke-2.3.0-wip

Browse Source

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

...

This commit is contained in:

Mark Otto

2013-02-05 19:39:49 -08:00

parent cb0fed6693 c55329085e

commit 15c7e73abd

19 changed files with 126 additions and 6159 deletions

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

docs/assets/css/bootstrap.css

Vendored

-6095

File diff suppressed because it is too large Load Diff