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)
commit91a19e7f23eac8f073b833e2886bcb7771ff7469
treeaab27ec11245b2c46e8baae2adb536e731165c87
parenteefe3f8e11391aa2a39b1abf20caa92db64ffdf9
parent88ea3e9381606ed2a8892ca3ac09495ae48e4e45
Merge remote-tracking branch 'origin/master' into v2.x

Conflicts:
pom.xml