mirror of
https://github.com/Qortal/qortal.git
synced 2025-07-22 20:26:50 +00:00
Merge remote-tracking branch 'qortal/master'
# Conflicts: # pom.xml # src/main/java/org/qortal/api/resource/ListsResource.java # src/main/java/org/qortal/list/ResourceList.java # src/main/java/org/qortal/list/ResourceListManager.java # src/main/java/org/qortal/transaction/ChatTransaction.java
This commit is contained in:
4
pom.xml
4
pom.xml
@@ -2,8 +2,8 @@
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>org.qortal</groupId>
|
||||
<artifactId>qortal-data</artifactId>
|
||||
<version>2.0.0</version>
|
||||
<artifactId>qortal</artifactId>
|
||||
<version>2.1.0</version>
|
||||
<packaging>jar</packaging>
|
||||
<properties>
|
||||
<skipTests>true</skipTests>
|
||||
|
Reference in New Issue
Block a user