From: Mathieu Baudier <mbaudier@argeo.org>
Date: Fri, 5 Feb 2021 19:49:08 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master' into v2.x
X-Git-Tag: argeo-commons-2.1.101~6
X-Git-Url: https://git.argeo.org/?a=commitdiff_plain;h=097c2213991d3b550ac176a979c0ce0484e2889b;hp=097c2213991d3b550ac176a979c0ce0484e2889b;p=lgpl%2Fargeo-commons.git

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

Conflicts:
	pom.xml
---