Manfred Karrer 2a004a2f68 Merge branch 'master' into TradePeriodStartsAfterConfirmation ... # Conflicts: # core/src/main/java/io/bisq/core/btc/wallet/WalletConfig.java		2018-01-26 12:22:45 -05:00
..
src	Merge branch 'master' into TradePeriodStartsAfterConfirmation	2018-01-26 12:22:45 -05:00
pom.xml	Release 0.6.4	2018-01-20 20:47:53 -05:00