From: Mathieu Baudier <mbaudier@argeo.org>
Date: Fri, 5 Feb 2021 20:10:40 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master' into v2.x
X-Git-Tag: argeo-suite-2.1.19~7
X-Git-Url: https://git.argeo.org/?p=gpl%2Fargeo-suite.git;a=commitdiff_plain;h=6f42fc5cdd7149a66a54afb399a2cbf15c8ca3b3

Merge remote-tracking branch 'origin/master' into v2.x

Conflicts:
	pom.xml
---

6f42fc5cdd7149a66a54afb399a2cbf15c8ca3b3
diff --cc pom.xml
index f85bda5,7626c1c..6b82c1e
--- a/pom.xml
+++ 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>