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/external_link_open_system_browser

Browse source 
# Conflicts:
#	www/views/tab-settings.html
This commit is contained in:
Jamal Jackson 2016-10-13 11:57:24 -04:00
commit 794e0a304e
78 changed files with 1066 additions and 678 deletions
Download patch file Download diff file Expand all files Collapse all files

6
www/views/termsOfUse.html
View file

@ -5,9 +5,9 @@
</ion-nav-back-button>
</ion-nav-bar>
<ion-content class="padding">
<div class="card">
<div class="item item-text-wrap" ng-include="'views/includes/terms.html'"></div>
<ion-content>
<div class="list">
<div class="item item-text-wrap" id="settings-tos" ng-include="'views/includes/terms.html'"></div>
</div>
<button class="button button-standard button-primary"
ng-show="lang != 'en'"