HenryNguyen5 c7b30bc5af Fix merge errors		2018-02-08 14:36:59 -05:00
..
actions	Merge develop	2018-02-08 14:36:51 -05:00
api	Remove redux-promise-middleware (#1022)	2018-02-07 17:59:55 -06:00
assets	Refresh balance button (#1027)	2018-02-08 01:22:32 -06:00
components	Fix merge errors	2018-02-08 14:36:59 -05:00
config	Merge develop	2018-02-08 14:36:51 -05:00
containers	Merge develop	2018-02-08 14:36:51 -05:00
libs	Fix merge errors	2018-02-08 14:36:59 -05:00
reducers	Fix merge errors	2018-02-08 14:36:59 -05:00
sagas	Merge develop	2018-02-08 14:36:51 -05:00
sass	Add nonce loading indicator & refresh button (#1021)	2018-02-08 11:51:15 -06:00
selectors	Merge develop	2018-02-08 14:36:51 -05:00
store	Merge develop	2018-02-08 14:36:51 -05:00
translations	Confirm TX Modal Upgrades (#928)	2018-02-06 22:39:24 -06:00
typescript	Update ethereumjs-util types (#1002)	2018-02-07 17:11:29 -06:00
utils	Merge develop	2018-02-08 14:36:51 -05:00
vendor	Update trezor-connect.js to v4 (#856)	2018-01-17 23:16:47 -06:00
Root.tsx	Add nonce loading indicator & refresh button (#1021)	2018-02-08 11:51:15 -06:00
freezer.ts	Prettier Reformat (#619)	2017-12-18 17:29:26 -06:00
index.html	MyEtherWallet -> MyCrypto (#977)	2018-02-06 22:28:28 -06:00
index.tsx	Revert "Implement `offline-plugin` for Service Workers / App Cache (#701)" (#760)	2018-01-08 23:04:20 -06:00