Sebastian Gerske 79281c4f98 Merge remote-tracking branch 'origin/develop' into feature/trilobite_countdown ... # Conflicts: # package.json		2018-11-27 09:02:08 +01:00
..
contracts	add event listener for lockPayment	2018-11-23 16:01:42 +01:00
ContractHandler.ts	webpack package builder	2018-11-26 15:55:09 +01:00
ContractReflector.ts	added event wireup	2018-11-20 09:13:03 +01:00
Event.ts	fix unsubscribe	2018-11-23 14:54:22 +01:00
EventListener.ts	added more functionality to event listener	2018-11-23 12:40:49 +01:00
Keeper.ts	add detection for local poa	2018-11-23 09:57:37 +01:00
Web3Provider.ts	added secret store	2018-10-26 13:37:09 +02:00