From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sun, 27 Feb 2022 08:19:09 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/unstable' into testing
X-Git-Tag: v2.1.19~2
X-Git-Url: https://git.argeo.org/?a=commitdiff_plain;h=bd6203837961476d3ad5e25af3cd79640e530a9c;p=gpl%2Fargeo-slc.git

Merge remote-tracking branch 'origin/unstable' into testing

Conflicts:
	sdk/argeo-build
---

bd6203837961476d3ad5e25af3cd79640e530a9c