Merge remote-tracking branch 'origin/master' into v2.x
authorMathieu Baudier <mbaudier@argeo.org>
Sun, 14 Feb 2021 16:33:15 +0000 (17:33 +0100)
committerMathieu Baudier <mbaudier@argeo.org>
Sun, 14 Feb 2021 16:33:15 +0000 (17:33 +0100)
Conflicts:
pom.xml


Trivial merge