Merge pull request #3528 from bitpay/v1.5

Updates v1.5 to master
This commit is contained in:
Matias Alejo Garcia 2015-11-25 14:29:52 -03:00
commit f8566cb99c
22 changed files with 215 additions and 79 deletions

View file

@ -6,7 +6,7 @@
 
</div>
<div class="small-10 columns">
<div ng-if="!$root.updatingBalance">
<div>
<span class="text-bold size-16"><span translate>Send</span> {{tx.amountStr}}</span>
<time class="right size-12 text-gray m5t">{{ (tx.ts || tx.createdOn ) * 1000 | amTimeAgo}}</time>
</div>