Merge branch 'master' of https://github.com/nuttertag/bootstrap into nuttertag-master

Browse Source

Conflicts:
	dist/css/bootstrap.min.css

...

This commit is contained in:

Mark Otto

2013-09-06 09:23:49 -07:00

parent 532e4bab58 a40568a1e0

commit 5c4c7eba54

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

2

dist/css/bootstrap.min.css vendored

File diff suppressed because one or more lines are too long