Manfred Karrer 7cb674a0a4 Merge branch 'master' of https://github.com/swordfish6975/exchange into swordfish6975-master ... # Conflicts: # gui/src/test/java/io/bisq/gui/util/validation/AltCoinAddressValidatorTest.java		2018-03-10 10:11:49 -05:00
..
main	Merge branch 'master' of https://github.com/swordfish6975/exchange into swordfish6975-master	2018-03-10 10:11:49 -05:00
test/java/io/bisq/common	Merge pull request #1294 from bisq-network/fix-custom-btc-nodes-issue-#1291	2018-01-30 20:59:19 +01:00