anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

fix merge conflicts

Browse source
This commit is contained in:
Marty Alcala 2016-10-21 09:38:27 -04:00
commit 3f402fbd89
65 changed files with 391 additions and 303 deletions
Download patch file Download diff file Expand all files Collapse all files

2
www/views/includes/wallets.html
View file

@ -10,7 +10,7 @@
<span class="item-note m10l">
{{wallet.status.availableBalanceStr}}
</span>
<span class="item-note m10l" ng-show="wallet.n > 1 && wallet.isComplete()">
<span class="item-note m10l wallet-number" ng-class="{'visible': wallet.n > 1 && wallet.isComplete()}">
{{wallet.m}}-of-{{wallet.n}}
</span>
</div>