Jaco Greeff b749718feb Merge branch 'master' into ui-2 ... # Conflicts: # js/src/views/Signer/RequestsPage/requestsPage.js		2017-04-25 11:10:23 +02:00
..
index.js	Fix whitespace (#4299)	2017-01-25 18:51:41 +01:00
methodDecoding.css	Fix whitespace (#4299)	2017-01-25 18:51:41 +01:00
methodDecoding.js	Cancel tx JS (#4958)	2017-04-25 10:08:09 +02:00
methodDecodingStore.js	First iteration of Status page (WIP)	2017-04-21 15:20:43 +02:00