Merge remote-tracking branch 'origin/master' into v2.x
authorMathieu Baudier <mbaudier@argeo.org>
Fri, 5 Feb 2021 20:10:40 +0000 (21:10 +0100)
committerMathieu Baudier <mbaudier@argeo.org>
Fri, 5 Feb 2021 20:10:40 +0000 (21:10 +0100)
Conflicts:
pom.xml

1  2 
pom.xml

diff --cc pom.xml
index f85bda54e08ed482e236b3f23fafadaebe68f84c,7626c1c6976d5356af9876ecf0d1b0e2ef099cb3..6b82c1eda64a7ef7f60ada0a25956f087bc5ff67
+++ b/pom.xml
@@@ -7,10 -9,10 +9,10 @@@
        </parent>
        <groupId>org.argeo.suite</groupId>
        <artifactId>argeo-suite</artifactId>
-       <packaging>pom</packaging>
-       <name>Argeo Suite</name>
-       <description />
 -      <version>2.3.1-SNAPSHOT</version>
 +      <version>2.1.19-SNAPSHOT</version>
+       <name>Argeo Suite</name>
+       <packaging>pom</packaging>
+       <url>http://www.argeo.org/</url>
        <properties>
                <!-- Dependencies -->
                <version.argeo-tp>2.1.27</version.argeo-tp>