Manfred Karrer 7e7a06a0da Merge branch 'jbg-add-xspec' ... # Conflicts: # gui/src/main/java/io/bisq/gui/util/validation/AltCoinAddressValidator.java # gui/src/test/java/io/bisq/gui/util/validation/AltCoinAddressValidatorTest.java		2017-12-19 21:22:42 +01:00
..
src	Merge branch 'jbg-add-xspec'	2017-12-19 21:22:42 +01:00
pom.xml	Set version 0.6.1. Add versions for seed and statistics nodes	2017-11-24 14:23:49 -05:00