From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sat, 12 Mar 2022 12:30:21 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/unstable' into testing
X-Git-Tag: v2.1.26~4
X-Git-Url: https://git.argeo.org/?p=gpl%2Fargeo-suite.git;a=commitdiff_plain;h=73f619d9a87672e9f6434123b2a741bdaf2f27e2;hp=73f619d9a87672e9f6434123b2a741bdaf2f27e2

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

Conflicts:
	sdk/output-cms-rap.target
	sdk/output-cms-rcp.target
---