diff options
| author | Mark Otto <[email protected]> | 2012-02-27 21:22:20 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-02-27 21:22:20 -0800 |
| commit | 5cc4fcf6a2ace006b8b4023c3e75d819d611b2e1 (patch) | |
| tree | daa7f9bc48b416aefca6e4b99830475e093e0c51 /docs/assets | |
| parent | 4e17b1975e1b38e3a1fe7851a0b59c645dba755f (diff) | |
| parent | be9ae7006033f2be11f3547f30425417830158ba (diff) | |
| download | bootstrap-5cc4fcf6a2ace006b8b4023c3e75d819d611b2e1.tar.xz bootstrap-5cc4fcf6a2ace006b8b4023c3e75d819d611b2e1.zip | |
Merge branch 'meleyal-fix-carousel-docs' into 2.0.2-wip
Conflicts:
docs/javascript.html
docs/templates/pages/javascript.mustache
Diffstat (limited to 'docs/assets')
| -rw-r--r-- | docs/assets/bootstrap.zip | bin | 54556 -> 54556 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip Binary files differindex 82ee1223c..260210777 100644 --- a/docs/assets/bootstrap.zip +++ b/docs/assets/bootstrap.zip |