From: Mathieu <mbaudier@argeo.org>
Date: Tue, 6 Dec 2022 05:12:22 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/unstable' into testing
X-Git-Tag: v2.1.21~2
X-Git-Url: https://git.argeo.org/?p=gpl%2Fargeo-slc.git;a=commitdiff_plain;h=840b5708cf4575b817a9b0ecc645f1b54bbb276e

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

840b5708cf4575b817a9b0ecc645f1b54bbb276e
diff --cc branch.mk
index 936a67569,afde0f838..dbecaaa4b
--- a/branch.mk
+++ b/branch.mk
@@@ -1,1 -1,1 +1,1 @@@
- include $(SDK_SRC_BASE)/cnf/testing.bnd
 -BRANCH=unstable
++BRANCH=testing
diff --cc sdk/branches/testing.bnd
index 000000000,000000000..8bf306ae1
new file mode 100644
--- /dev/null
+++ b/sdk/branches/testing.bnd
@@@ -1,0 -1,0 +1,4 @@@
++major=2
++minor=1
++micro=20
++qualifier=.next