mirror of https://github.com/BTCPrivate/copay.git
merge conflicts
This commit is contained in:
parent
93620fa6c0
commit
d0c408553d
|
@ -19,7 +19,7 @@
|
||||||
</div>
|
</div>
|
||||||
<div class="large-9 medium-9 columns text-center p10t" ng-show="$root.wallet">
|
<div class="large-9 medium-9 columns text-center p10t" ng-show="$root.wallet">
|
||||||
<div class="large-4 medium-4 columns line-dashed-v">
|
<div class="large-4 medium-4 columns line-dashed-v">
|
||||||
<a href="#/peer" class="has-tip" tooltip-placement="bottom" tooltip="{{$root.wallet.id}}">
|
<a href="#/addresses" class="has-tip" tooltip-placement="bottom" tooltip="{{$root.wallet.id}}">
|
||||||
<strong><span>{{$root.getWalletDisplay()}}</span></strong>
|
<strong><span>{{$root.getWalletDisplay()}}</span></strong>
|
||||||
</a>
|
</a>
|
||||||
<a class="button radius small-icon" href="#" title="Signout" ng-click="signout()"><i class="fi-power"></i></a>
|
<a class="button radius small-icon" href="#" title="Signout" ng-click="signout()"><i class="fi-power"></i></a>
|
||||||
|
|
Loading…
Reference in New Issue