Merge branch 'master' into pr/12388

Browse Source

Conflicts:
	dist/css/bootstrap.min.css

...

This commit is contained in:

Mark Otto

2014-01-29 22:18:29 -08:00

parent e38fd138ce 9195d8e8eb

commit d2f1887bb5

30 changed files with 317 additions and 257 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.css.map vendored

File diff suppressed because one or more lines are too long