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
..
src	Merge branch 'list-din-altcoin' of https://github.com/dinerocoin/exchange into dinerocoin-list-din-altcoin	2018-03-10 10:08:57 -05:00
pom.xml	Set Maven version to -SNAPSHOT	2018-03-09 10:29:23 +01:00