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

Browse Source

Conflicts:
	dist/css/bootstrap.min.css

...

This commit is contained in:

Mark Otto

2013-08-14 15:33:38 -07:00

parent c8c9274728 1e1b5c737b

commit 0086761660

3 changed files with 18 additions and 16 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

dist/css/bootstrap.min.css

Vendored

+1 -1

File diff suppressed because one or more lines are too long