Merge branch 'master' into responsive-visibility-table

Browse Source

Conflicts:
	dist/css/bootstrap.min.css

...

This commit is contained in:

Mark Otto

2013-12-03 22:58:25 -08:00

parent 303f8a33c3 ed0d556847

commit a42e9163cb

12 changed files with 117 additions and 59 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/js/bootstrap.min.js vendored

File diff suppressed because one or more lines are too long