Skip to content

Commit

Permalink
Merge branch 'master' of github.com:vuejs/vuejs.org
Browse files Browse the repository at this point in the history
  • Loading branch information
yyx990803 committed Oct 23, 2015
2 parents 3adfba2 + 0de96c7 commit 7baac69
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/api/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -1455,7 +1455,7 @@ type: api

Toggle's the element's `display` CSS property based on the truthy-ness of the expression value. Triggers transitions if present.

- **See also:** [Conditional Rendering](/guide/conditional.html#v-show)
- **See also:** [Conditional Rendering - v-show](/guide/conditional.html#v-show)

### v-else

Expand All @@ -1476,7 +1476,7 @@ type: api
</div>
```

- **See also:** [Conditional Rendering](/guide/conditional.html#v-show)
- **See also:** [Conditional Rendering - v-else](/guide/conditional.html#v-else)

### v-for

Expand Down

0 comments on commit 7baac69

Please sign in to comment.