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

Browse Source

Conflicts:
	dist/css/bootstrap.min.css

...

This commit is contained in:

Mark Otto

2013-08-14 15:19:57 -07:00

parent 2002045b7f 09e1f69d3e

commit 48bcf81646

2 changed files with 15 additions and 15 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