Merge branch 'master' into 3.0.0-wip

Browse Source

Conflicts:
	docs/assets/js/bootstrap.min.js

...

This commit is contained in:

Mark Otto

2013-02-07 22:18:53 -08:00

parent a9729c5fd0 8c7f9c66a7

commit 2aa1a4dc70

12 changed files with 71 additions and 33 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

docs/assets/js/bootstrap.min.js

Vendored

+1 -1

File diff suppressed because one or more lines are too long