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

Browse source 
# Conflicts:
#	public/views/preferencesLanguage.html
This commit is contained in:
Jamal Jackson 2016-09-22 15:08:53 -04:00
commit 64fb4a2e81
80 changed files with 608 additions and 502 deletions
Download patch file Download diff file Expand all files Collapse all files

2
public/views/preferencesAdvanced.html
View file

@ -4,7 +4,7 @@
<ion-nav-back-button>
</ion-nav-back-button>
</ion-nav-bar>
<ion-content ng-controller="preferencesAdvancedController">
<ion-content>
<div class="list">
<div class="item item-divider">
</div>