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

Browse Source

Conflicts:
	dist/css/bootstrap.min.css

...

This commit is contained in:

Mark Otto

2013-10-20 19:55:56 -07:00

parent dd34102cb6 976f6dfdad

commit 369f5ba760

3 changed files with 5 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