Manfred Karrer e9a0d7e3ff Merge branch 'list-din-altcoin' of https://github.com/dinerocoin/exchange into dinerocoin-list-din-altcoin ... # Conflicts: # core/src/main/java/io/bisq/core/trade/statistics/TradeStatisticsManager.java # gui/src/test/java/io/bisq/gui/util/validation/AltCoinAddressValidatorTest.java		2018-03-10 10:08:57 -05:00
..
main	Merge branch 'list-din-altcoin' of https://github.com/dinerocoin/exchange into dinerocoin-list-din-altcoin	2018-03-10 10:08:57 -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