From 9802a38aeb2d1daafb5ee8b950169441b08809a3 Mon Sep 17 00:00:00 2001
From: bmortier <benoit.mortier@opensides.be>
Date: Mon, 3 Dec 2018 18:52:40 +0100
Subject: [PATCH] Resolve "merge Changelog.md, Authors, UPGRADE.md have to be
 merged into -dev after 1.2.3 is released"

---
 Changelog.md | 21 +++++++++++++++++++++
 UPGRADE.md   | 34 ++++++++++++++++++++++++++++++++++
 2 files changed, 55 insertions(+)

diff --git a/Changelog.md b/Changelog.md
index f0ac9595c..e79643c04 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -164,6 +164,27 @@
 - fd-plugins#5839 dashboard crash if we have system plugin but not argonaut plugin in FD 1.3
 - fd-plugins#5842 Invalid call to strpos in debconfProfileGeneric
 
+## %"FusionDirectory 1.2.3" - 2018-11-15
+
+### Added
+
+#### fusiondirectory
+- fd#5890 hash_equals is not available in PHP 5.4
+- fd#5901 Add the pdf with the oid of fusiondirectory in the contrib dir of the core
+
+### Fixed
+
+#### fusiondirectory
+- fd#5797 cancel button has no effect (apply template)
+
+#### fusiondirectory-plugins
+- fd-plugins#5870 Supann should not trigger PHP errors on empty lines in nomenclature files
+
+### Security
+
+#### fusiondirectory
+- fd#5918 Password recovery does not escape fields in error messages
+
 ## %"FusionDirectory 1.2.2" - 2018-08-16
 
 ### Added
diff --git a/UPGRADE.md b/UPGRADE.md
index d4b3f9627..1c54895cf 100644
--- a/UPGRADE.md
+++ b/UPGRADE.md
@@ -3087,6 +3087,40 @@ apt-get install fusiondirectory
 apt-get install fusiondirectory-schema
 ```
 
+
+## Migrate FusionDirectory from 1.2.1 to 1.2.2
+
+### Upgrade FusionDirectory first
+
+  * Upgrade FusionDirectory core package before other ones to avoid dependencies errors:
+
+```shell
+apt-get install fusiondirectory
+```
+
+  * Upgrade FusionDirectory schema package too.
+
+```shell
+apt-get install fusiondirectory-schema
+```
+
+## Migrate FusionDirectory from 1.2.2 to 1.2.3
+
+### Upgrade FusionDirectory first
+
+  * Upgrade FusionDirectory core package before other ones to avoid dependencies errors:
+
+```shell
+apt-get install fusiondirectory
+```
+
+  * Upgrade FusionDirectory schema package too.
+
+```shell
+apt-get install fusiondirectory-schema
+```
+
+
 [php-cas]: http://packages.ubuntu.com/trusty/all/php-cas/download
 
 [repo-urls]: https://documentation.fusiondirectory.org/en/dl_install
-- 
GitLab