Jaco Greeff 9b025cf8c1 Merge branch 'master' into ui-2 ... # Conflicts: # js/src/views/ContractDevelop/store.js		2017-05-05 10:08:10 +02:00
..
actions.js	Fix whitespace (#4299)	2017-01-25 18:51:41 +01:00
middleware.js	Merge branch 'master' into ui-2	2017-05-05 10:08:10 +02:00
reducer.js	Fix whitespace (#4299)	2017-01-25 18:51:41 +01:00