Merge branch 'master' into pirate-chain

# Conflicts:
#	src/test/java/org/qortal/test/crosschain/DigibyteTests.java
#	src/test/java/org/qortal/test/crosschain/RavencoinTests.java
This commit is contained in:
CalDescent
2022-05-10 07:54:47 +01:00
3 changed files with 7 additions and 7 deletions

View File

@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.qortal</groupId>
<artifactId>qortal</artifactId>
<version>3.2.5</version>
<version>3.3.0</version>
<packaging>jar</packaging>
<properties>
<skipTests>true</skipTests>