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

Merge branch 'ref/design' of https://github.com/bitpay/bitpay-wallet into feature/home_views_polish

Browse source 
# Conflicts:
#	public/views/tab-home.html
This commit is contained in:
Jamal Jackson 2016-09-27 13:43:36 -04:00
commit 28b6e312a7
19 changed files with 191 additions and 137 deletions
Download patch file Download diff file Expand all files Collapse all files

1
public/views/tab-home.html
View file

@ -25,7 +25,6 @@
<a class="item item-icon-right item-heading" ui-sref="tabs.proposals" translate>
Payment Proposals
<i class="icon nav-item-arrow-right"></i>
<span class="badge badge-assertive" ng-if="txpsN>3" translate> {{txpsN}}</span>
</a>