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

Merge pull request #3528 from bitpay/v1.5

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

2
public/views/modals/txp-details.html
View file

@ -156,7 +156,7 @@
</div>
</div>
<div class="columns text-center m20t" ng-if="tx.canBeRemoved">
<div class="columns text-center m20t" ng-if="tx.canBeRemoved && isShared">
<div class="text-gray size-12 m20b" ng-if="!tx.isGlidera" translate>
* A payment proposal can be deleted if 1) you are the creator, and no other copayer has signed, or 2) 24 hours have passed since the proposal was created.
</div>