set version to v2.9.3_DEV

CHANGELOG.md

@@ -5,6 +5,17 @@ Tous les changements notables de ce projet sont documentés dans ce fichier.
 Le format s'appuie sur [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 et le projet suit [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## 2.9.3     (unreleased)
+
+### Added
+
+### Changed
+
+### Fixed
+
+### Security
+
+
 ## [2.9.2](https://gitlab.adullact.net/Comptoir/Comptoir-srv/tags/v2.9.2)  - 2021-03-23
 
 ### Fixed

Documentation/For_ops/Realese/HOWTO_Create_a_release.md

@@ -14,7 +14,7 @@ Once the code in `develop`  is ready, merge into `master` like follows:
 ```sh
 git checkout master
 MYTAG="vX.Y.Z"
-git merge develop --no-ff --no-verify -m "Comptoir $MYTAG"
+git merge develop --no-verify --no-ff -m "Comptoir $MYTAG"
 git tag -a $MYTAG -m "$MYTAG"
 git push origin master
 git push origin $MYTAG

config/bootstrap.php

@@ -281,7 +281,7 @@ Configure::write(
 Configure::write(
     'VERSION',
     [
-        "footer" => "v2.9.2"
+        "footer" => "v2.9.3_DEV"
     ]
 );