Merge branch 'master' of github.com:Qortal/qortal

# Conflicts:
#	src/main/java/org/qortal/data/block/BlockData.java
This commit is contained in:
CalDescent
2021-12-15 16:40:53 +00:00
6 changed files with 27 additions and 8 deletions

View File

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