From ee8285376e9b2ce13489408c180a0d49b1c8487f Mon Sep 17 00:00:00 2001 From: Matthieu Kermagoret <mkermagoret@centreon.com> Date: Wed, 10 May 2017 11:46:24 +0200 Subject: [PATCH] Prepare 2.8.8 release. --- doc/en/release_notes/centreon-2.8/centreon-2.8.8.rst | 3 +++ doc/en/release_notes/centreon-2.8/index.rst | 3 +++ 2 files changed, 6 insertions(+) diff --git a/doc/en/release_notes/centreon-2.8/centreon-2.8.8.rst b/doc/en/release_notes/centreon-2.8/centreon-2.8.8.rst index 636777983a..baab93660b 100644 --- a/doc/en/release_notes/centreon-2.8/centreon-2.8.8.rst +++ b/doc/en/release_notes/centreon-2.8/centreon-2.8.8.rst @@ -7,4 +7,7 @@ Bug Fixes * Fix Centreon Engine configuration form * Fix custom view sharing +<<<<<<< HEAD * Fix Knowledge Base script compatibility with PHP < 5.4 +======= +>>>>>>> a9015123a... Prepare 2.8.8 release. diff --git a/doc/en/release_notes/centreon-2.8/index.rst b/doc/en/release_notes/centreon-2.8/index.rst index 3c75036eda..48d1548335 100644 --- a/doc/en/release_notes/centreon-2.8/index.rst +++ b/doc/en/release_notes/centreon-2.8/index.rst @@ -15,6 +15,7 @@ Please find here the release notes dedicated to the last 2.8.x version of Centre centreon-2.8.6 centreon-2.8.7 centreon-2.8.8 +<<<<<<< HEAD centreon-2.8.9 centreon-2.8.10 centreon-2.8.11 @@ -26,3 +27,5 @@ Please find here the release notes dedicated to the last 2.8.x version of Centre centreon-2.8.17 centreon-2.8.18 centreon-2.8.19 +======= +>>>>>>> a9015123a... Prepare 2.8.8 release. -- GitLab