From: Mathieu Baudier <mbaudier@argeo.org>
Date: Thu, 9 Nov 2023 10:35:47 +0000 (+0100)
Subject: Merge tag 'v2.3.15' into testing
X-Git-Tag: v2.1.34~3
X-Git-Url: https://git.argeo.org/?a=commitdiff_plain;h=0956ab175dc0862d21a0c2418351312715681842;hp=7ce332ca697285527d6369c416ad55fea507d407;p=gpl%2Fargeo-tp.git

Merge tag 'v2.3.15' into testing
---

diff --git a/.gitmodules b/.gitmodules
index 07b10ca..d728334 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,4 +1,4 @@
 [submodule "sdk/argeo-build"]
 	path = sdk/argeo-build
 	url = http://git.argeo.org/cc0/argeo-build.git
-	branch = unstable
+	branch = testing
diff --git a/branch.mk b/branch.mk
index afde0f8..dbecaaa 100644
--- a/branch.mk
+++ b/branch.mk
@@ -1 +1 @@
-BRANCH=unstable
\ No newline at end of file
+BRANCH=testing
\ No newline at end of file
diff --git a/sdk/argeo-build b/sdk/argeo-build
index 955c266..d5943f5 160000
--- a/sdk/argeo-build
+++ b/sdk/argeo-build
@@ -1 +1 @@
-Subproject commit 955c2667d48eed38665e24e00c9d82bfd38f419d
+Subproject commit d5943f556d6fba9db0dd63d4c4cfceef89e4888e
diff --git a/sdk/branches/testing.bnd b/sdk/branches/testing.bnd
new file mode 100644
index 0000000..6297da7
--- /dev/null
+++ b/sdk/branches/testing.bnd
@@ -0,0 +1,4 @@
+major=2
+minor=1
+micro=33
+qualifier=.next