Manfred Karrer e8c46c9709 Merge branch 'master' into Development ... # Conflicts: # doc/build.md		2017-08-09 12:48:07 +02:00
..
src	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
pom.xml	Merge branch 'master' into Development	2017-08-09 12:48:07 +02:00