Manfred Karrer 879d8e0660 Merge branch 'add-darx-altcoin' of https://github.com/bitdaric/exchange into bitdaric-add-darx-altcoin ... # Conflicts: # core/src/main/java/io/bisq/core/trade/statistics/TradeStatisticsManager.java # gui/src/main/java/io/bisq/gui/util/validation/AltCoinAddressValidator.java # gui/src/test/java/io/bisq/gui/util/validation/AltCoinAddressValidatorTest.java		2018-02-13 20:19:14 -05:00
..
src	Merge branch 'add-darx-altcoin' of https://github.com/bitdaric/exchange into bitdaric-add-darx-altcoin	2018-02-13 20:19:14 -05:00
pom.xml	v0.6.5	2018-01-31 13:04:24 -05:00