Fix Conflicts:

views/modals/qr-address.html
This commit is contained in:
Gustavo Maximiliano Cortez 2014-08-01 11:28:16 -03:00
commit 1cd1ad2ff8
3 changed files with 15 additions and 2 deletions

View file

@ -1,5 +1,5 @@
<div class="text-center">
<qrcode size="160" data="{{address.address}}"></qrcode>
<qrcode size="160" data="bitcoin:{{address.address}}"></qrcode>
<h4>{{address.address}} <span class="btn-copy" clip-copy="address.address"></span></h4>
<div>