Manfred Karrer 4da613f4b5 Merge branch 'master' into release-candidate-0.9.0 ... # Conflicts: # assets/src/main/java/bisq/asset/coins/BitCloud.java # assets/src/main/java/bisq/asset/coins/Credits.java # assets/src/main/java/bisq/asset/coins/Cryptonodes.java # assets/src/main/java/bisq/asset/coins/DRIP.java # assets/src/main/java/bisq/asset/coins/FuturoCoin.java # assets/src/main/java/bisq/asset/coins/MegaCoin.java # assets/src/main/java/bisq/asset/coins/NewPowerCoin.java # assets/src/main/java/bisq/asset/coins/Wavi.java # assets/src/test/java/bisq/asset/coins/BitCloudTest.java # assets/src/test/java/bisq/asset/coins/CreditsTest.java # assets/src/test/java/bisq/asset/coins/CryptonodesTest.java # assets/src/test/java/bisq/asset/coins/DRIPTest.java # assets/src/test/java/bisq/asset/coins/FuturoCoinTest.java # assets/src/test/java/bisq/asset/coins/MegaCoinTest.java # assets/src/test/java/bisq/asset/coins/NewPowerCoinTest.java		2018-12-02 12:27:03 +01:00
..
src	Merge branch 'master' into release-candidate-0.9.0	2018-12-02 12:27:03 +01:00