Merge branch '3.0.0-wip' into bs3_theme

Browse Source

Conflicts:
	dist/css/bootstrap.min.css

...

This commit is contained in:

Mark Otto

2013-08-06 18:29:54 -07:00

parent 7e19b6b02c 41bdd1a482

commit 402dbfb617

54 changed files with 1667 additions and 1033 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

839

dist/css/bootstrap.css vendored

File diff suppressed because it is too large Load Diff

2

dist/css/bootstrap.min.css vendored

File diff suppressed because one or more lines are too long