Jaco Greeff
|
db9a70d008
|
Merge branch 'master' into ui-2
# Conflicts:
# js/package-lock.json
# js/src/Application/application.js
# js/src/api/rpc/parity/parity.js
# js/src/api/subscriptions/manager.spec.js
# js/src/api/subscriptions/personal.spec.js
# js/src/jsonrpc/interfaces/parity.js
# js/src/mobx/hardwareStore.js
# js/src/mobx/hardwareStore.spec.js
# js/src/modals/index.js
# js/src/redux/providers/signerMiddleware.spec.js
# js/src/ui/SelectionList/selectionList.css
# js/src/views/Account/account.spec.js
# js/src/views/Accounts/accounts.spec.js
# js/src/views/Application/Extension/store.js
# js/src/views/Signer/components/SignRequest/signRequest.spec.js
|
2017-09-18 11:44:09 +02:00 |
|