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-17 17:31:58 -07:00

parent 2af9cf10ce e29c23afab

commit ba20e512ce

116 changed files with 9929 additions and 3134 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

1998

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