From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sat, 16 Mar 2024 07:28:49 +0000 (+0100)
Subject: Merge tag 'v2.3.6' into testing
X-Git-Tag: v2.1.4~1
X-Git-Url: https://git.argeo.org/?p=gpl%2Fargeo-freed.git;a=commitdiff_plain;h=5771ff9775a3acc328d9be08772d38e6f7d77df1

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

5771ff9775a3acc328d9be08772d38e6f7d77df1
diff --cc argeo-freed.spec
index 3535875,e6ee151..38c6c84
--- a/argeo-freed.spec
+++ b/argeo-freed.spec
@@@ -1,5 -1,5 +1,5 @@@
  Name:           argeo-freed
- Version:        2.1.3
 -Version:        2.3.6
++Version:        2.1.4
  Release:        1%{?dist}
  Summary:        Utilities for a FREEd compatible domain
  
diff --cc debian/changelog
index a4e47ce,d0d2678..ac895c6
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,5 -1,5 +1,5 @@@
- argeo-freed (2.1.3) testing; urgency=medium
 -argeo-freed (2.3.6) unstable; urgency=medium
++argeo-freed (2.1.4) testing; urgency=medium
  
-   * Adapt to changes in Argeo TP
+   * New directory structure
  
-  -- Mathieu Baudier <mbaudier@argeo.org>  Thu, 14 Dec 2023 05:48:41 +0000
 - -- Mathieu Baudier <mbaudier@argeo.org>  Wed, 13 Mar 2024 11:12:52 +0000
++ -- Mathieu Baudier <mbaudier@argeo.org>  Sat, 16 Mar 2024 07:25:57 +0000