Merge branch '3.0.0-wip' into bs3-normalize

Browse Source

Conflicts:
	less/bootstrap.less

...

This commit is contained in:

Mark Otto

2012-12-20 14:02:54 -08:00

parent 28c928f010 8eb1549842

commit be74ad7e0d

55 changed files with 1005 additions and 3013 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

+241 -568

File diff suppressed because it is too large Load Diff