From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sat, 16 Mar 2024 07:00:57 +0000 (+0100)
Subject: Merge tag 'v2.3.18' into testing
X-Git-Tag: v2.1.36~1
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=c74c5a87a9895e0b505c27f5d2c3ceb80ca144ea;hp=f055d3dd9287f80b817d9c266d622e315c30a829;p=gpl%2Fargeo-tp.git

Merge tag 'v2.3.18' 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 ec9a0b6..979b11e 160000
--- a/sdk/argeo-build
+++ b/sdk/argeo-build
@@ -1 +1 @@
-Subproject commit ec9a0b67c92105fc42ec14cdbec7ff9464c6cc3c
+Subproject commit 979b11e352bda7d783c921a62e8cb5ed950a7564
diff --git a/sdk/branches/testing.bnd b/sdk/branches/testing.bnd
new file mode 100644
index 0000000..f2d8abd
--- /dev/null
+++ b/sdk/branches/testing.bnd
@@ -0,0 +1,4 @@
+major=2
+minor=1
+micro=35
+qualifier=.next