Merge branch 'ravencoin' into new-coins

# Conflicts:
#	pom.xml
#	src/main/java/org/qortal/controller/tradebot/TradeBot.java
#	src/main/java/org/qortal/crosschain/SupportedBlockchain.java
#	src/main/java/org/qortal/settings/Settings.java
This commit is contained in:
CalDescent
2022-05-01 16:28:22 +01:00
11 changed files with 3030 additions and 1 deletions

View File

@@ -7,7 +7,7 @@
<packaging>jar</packaging>
<properties>
<skipTests>true</skipTests>
<altcoinj.version>02e0d3d</altcoinj.version>
<altcoinj.version>6628cfd</altcoinj.version>
<bitcoinj.version>0.15.10</bitcoinj.version>
<bouncycastle.version>1.64</bouncycastle.version>
<build.timestamp>${maven.build.timestamp}</build.timestamp>