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:
commit
4004efd5e4
16 changed files with 138 additions and 36 deletions
|
|
@ -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';
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue