From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sun, 14 Feb 2021 16:33:15 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master' into v2.x
X-Git-Tag: argeo-suite-2.1.21~1
X-Git-Url: https://git.argeo.org/?p=gpl%2Fargeo-suite.git;a=commitdiff_plain;h=91a19e7f23eac8f073b833e2886bcb7771ff7469

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

Conflicts:
	pom.xml
---

91a19e7f23eac8f073b833e2886bcb7771ff7469