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;hp=6f42fc5cdd7149a66a54afb399a2cbf15c8ca3b3

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

Conflicts:
	pom.xml
---