Merge branch 'feature/settings_views_polish' of https://github.com/jamal-jackson/bitpay-wallet into feature/address_book

# Conflicts:
#	src/sass/views/address-book.scss
This commit is contained in:
Jamal Jackson 2016-09-23 10:11:19 -04:00
commit 4004efd5e4
16 changed files with 138 additions and 36 deletions

View file

@ -993,6 +993,7 @@ input[type=number] {
@import "views/tab-settings";
@import "views/walletDetails";
@import "views/bitpayCard";
@import "views/address-book";
@import "views/wallet-backup-phrase";
@import "views/address-book";
@import 'views/onboarding/onboarding';