Manfred Karrer 18d0bc0464 Merge branch 'Development' into DAO ... # Conflicts: # gui/src/main/java/io/bisq/gui/main/overlays/windows/SpendFromDepositTxWindow.java # gui/src/main/java/io/bisq/gui/util/validation/AltCoinAddressValidator.java		2017-04-24 21:40:25 -05:00
..
src	Merge branch 'Development' into DAO	2017-04-24 21:40:25 -05:00
pom.xml	Adjust code to work with BitcoinJ 0.14.4.1	2017-04-21 15:20:32 -05:00