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
..
2017-09-07 13:32:45 +02:00
2017-09-07 13:32:45 +02:00
2017-09-18 11:44:09 +02:00
2017-09-18 10:15:36 +02:00
2017-08-07 12:02:39 +02:00
2017-09-11 10:37:09 +02:00
2017-09-18 10:15:36 +02:00
2016-10-18 11:52:56 +02:00
2016-10-18 11:52:56 +02:00
2017-01-23 13:39:52 +01:00
2017-05-18 10:06:59 +02:00
2017-07-28 10:25:34 +02:00
2016-10-18 11:52:56 +02:00
2016-10-18 11:52:56 +02:00
2017-03-31 23:36:24 +02:00
2016-12-14 16:42:26 +01:00
2017-01-25 18:51:41 +01:00
2017-03-21 23:26:05 +03:00
2017-07-13 15:52:01 +02:00
2016-10-18 11:52:56 +02:00
2017-09-18 10:35:00 +02:00
2017-09-11 10:37:09 +02:00
2017-09-18 10:56:09 +02:00
2016-11-12 15:21:51 +01:00