Manfred Karrer 0e16522307 Merge branch 'Development' into dao ... # Conflicts: # core/src/main/java/io/bisq/core/dao/blockchain/BsqNode.java		2017-12-08 11:17:47 -05:00
..
src	Merge branch 'Development' into dao	2017-12-08 11:17:47 -05:00
pom.xml	Set version 0.6.1. Add versions for seed and statistics nodes	2017-11-24 14:23:49 -05:00