Merge tag 'v2.3.6' into testing

diff --cc argeo-freed.spec
index 3535875b64f6f5a18e328d768744097fbb026906,e6ee1517c36b0da30825592606a449dd1079b6c2..38c6c840daf50286814d7ccc275283abcc39a063
--- 1/argeo-freed.spec
--- 2/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 a4e47ce2bd6c8f903a1dd68c1713a348bb8ae7ca,d0d2678ed5c62f981d75940177ce3c8d2086e013..ac895c6c3511c48b94c1c09e0c08eab7bfd6b08c
--- 1/debian/changelog
--- 2/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