Qortal/qortal
1
0
Fork 1
mirror of https://github.com/Qortal/qortal.git synced 2025-07-22 20:26:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into pirate-chain

Browse Source 
# Conflicts:
#	src/main/java/org/qortal/api/resource/CrossChainTradeBotResource.java
#	src/main/java/org/qortal/repository/hsqldb/HSQLDBDatabaseUpdates.java
This commit is contained in:
CalDescent
2022-07-15 11:46:45 +01:00
parent 6dd44317c4 57bd3c3459
commit fb9a155e4c
88 changed files with 5270 additions and 1025 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

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