From: Mathieu Baudier <mbaudier@argeo.org>
Date: Tue, 6 Apr 2021 04:34:27 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/v2.x'
X-Git-Tag: argeo-suite-2.3.1~63
X-Git-Url: https://git.argeo.org/?a=commitdiff_plain;ds=sidebyside;h=c161d371733e246ae20f316a7c70e09868fafbd6;hp=c161d371733e246ae20f316a7c70e09868fafbd6;p=gpl%2Fargeo-suite.git

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

Conflicts:
	pom.xml
---