Merge branch 'master' into list-border-refactor

This commit is contained in:
Brandy Carney
2015-11-12 13:32:19 -05:00

View File

@ -25,14 +25,12 @@
<p>{{character.quote}}</p> <p>{{character.quote}}</p>
</ion-item> </ion-item>
<div *ng-for="#item of character['items']"> <ion-item *ng-for="#item of character['items']">
<ion-item> {{item.title}}
{{item.title}} <ion-note item-right>
<ion-note item-right> {{item.note}}
{{item.note}} </ion-note>
</ion-note> </ion-item>
</ion-item>
</div>
</ion-list> </ion-list>