Merge branch 'meleyal-fix-carousel-docs' into 2.0.2-wip

Browse Source

Conflicts:
	docs/javascript.html
	docs/templates/pages/javascript.mustache

...

This commit is contained in:

Mark Otto

2012-02-27 21:22:20 -08:00

parent 4e17b1975e be9ae70060

commit 5cc4fcf6a2

3 changed files with 4 additions and 4 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/bootstrap.zip

BIN

Binary file not shown.