Manfred Karrer 83cd1b7ebc Merge branch 'master' into Development ... # Conflicts: # core/src/main/java/io/bisq/core/app/BisqEnvironment.java		2017-12-17 22:11:12 +01:00
..
src	Merge branch 'master' into Development	2017-12-17 22:11:12 +01:00
pom.xml	Set version 0.6.1. Add versions for seed and statistics nodes	2017-11-24 14:23:49 -05:00