From: Mathieu Baudier <mbaudier@argeo.org>
Date: Wed, 19 Oct 2022 07:46:15 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/unstable' into merge-to-testing
X-Git-Tag: v2.1.26~1^2~4
X-Git-Url: https://git.argeo.org/?p=gpl%2Fargeo-suite.git;a=commitdiff_plain;h=cc03074c27d48af9e5842272c18f8c418a25d3e6

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

cc03074c27d48af9e5842272c18f8c418a25d3e6
diff --cc .gitmodules
index d728334,07b10ca..3a63021
--- a/.gitmodules
+++ b/.gitmodules
@@@ -1,4 -1,4 +1,4 @@@
  [submodule "sdk/argeo-build"]
  	path = sdk/argeo-build
--	url = http://git.argeo.org/cc0/argeo-build.git
- 	branch = testing
 -	branch = unstable
++	url = https://code.argeo.org/git/cc0/argeo-build.git
++	branch = merge-to-testing
diff --cc branch.mk
index 936a675,afde0f8..dbecaaa
--- 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 0000000,0000000..22ef9a8
new file mode 100644
--- /dev/null
+++ b/sdk/branches/testing.bnd
@@@ -1,0 -1,0 +1,4 @@@
++major=2
++minor=1
++micro=25
++qualifier=.next