Manfred Karrer c744cb5a96 Merge branch 'Development' into DAO_phase1		2017-07-26 21:38:21 +02:00
..
src	Merge branch 'Development' into DAO_phase1	2017-07-26 13:21:07 +02:00
pom.xml	make a tradeProtocol getter for api use, cleanup protobuf in main pom and move protobuf-util to common like the other protobuf dependency. Also make it visible outside of test	2017-07-26 16:37:59 +02:00