From: Mathieu Baudier <mbaudier@argeo.org>
Date: Thu, 11 Feb 2021 13:05:44 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master' into v2.x
X-Git-Tag: argeo-suite-2.1.20~1
X-Git-Url: https://git.argeo.org/?p=gpl%2Fargeo-suite.git;a=commitdiff_plain;h=bf08be4b1dd28f8d7639db1badf0bbd449b5e388;hp=bf08be4b1dd28f8d7639db1badf0bbd449b5e388

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

Conflicts:
	lib/pom.xml
	pom.xml
---