javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-08-18 19:21:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into css-refactor

Browse Source 
# Conflicts:
#	ionic/components/action-sheet/action-sheet.ts
This commit is contained in:
Brandy Carney
2015-12-04 14:09:48 -05:00
parent c5af9a608e bc289cce8a
commit 76dbdda086
7 changed files with 88 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/docs/templates/common.template.html vendored
View File

@ -151,8 +151,8 @@ Delegate: <$ doc.delegate $>
<@ endif -@>
<h2>Usage</h2>
<@ if doc.usage @>
<h2>Usage</h2>
<@ block usage @>
<$ doc.usage | marked $>
<@ endblock @>