Merge remote-tracking branch 'origin/master' into v2.x
authorMathieu Baudier <mbaudier@argeo.org>
Fri, 5 Feb 2021 20:10:40 +0000 (21:10 +0100)
committerMathieu Baudier <mbaudier@argeo.org>
Fri, 5 Feb 2021 20:10:40 +0000 (21:10 +0100)
commit6f42fc5cdd7149a66a54afb399a2cbf15c8ca3b3
tree81c2dbbf20e4511254400bbabcdedafbb06ccc14
parent83040dd8d0636a58d1e828452842dea2bf69ce0d
parent33d990f4d6522959211e2a961ec756ee849c6296
Merge remote-tracking branch 'origin/master' into v2.x

Conflicts:
pom.xml
pom.xml