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

Fixed socke-emit-on

Browse source 
Merge branch 'master' into feature/socket-io-support

Fix conflicts:
	js/controllers/home.js
This commit is contained in:
Gustavo Cortez 2014-04-17 11:11:17 -03:00
commit 9fdb04e868
4 changed files with 21 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
index.html
View file

@ -178,7 +178,7 @@
<div class="row">
<div class="large-6 columns">
<a class="panel db" ng-repeat="addr in addrs" ng-click="selectAddr(addr)">{{addr}} <span class="right"> &gt;</span></a>
<a class="panel db" ng-repeat="addr in addrs" ng-click="selectAddr(addr)">{{addr}} <span class="right">({{addrBalance[addr]}} BTC) &gt;</span></a>
</div>
<div class="large-3 columns line-dashed-v text-center">
<qrcode size="160" data="{{selectedAddr}}"></qrcode>