From c70fc7d8d59c0573ca1d35d1163ebffd50e90fbf Mon Sep 17 00:00:00 2001
From: Laurent Laffont <llaffont@afi-sa.fr>
Date: Mon, 9 Oct 2017 14:12:03 +0200
Subject: [PATCH] 7.10.6
---
FEATURES/59187 | 10 ----------
VERSIONS | 5 +++++
VERSIONS_WIP/59187 | 1 -
library/startup.php | 2 +-
4 files changed, 6 insertions(+), 12 deletions(-)
delete mode 100644 FEATURES/59187
delete mode 100644 VERSIONS_WIP/59187
diff --git a/FEATURES/59187 b/FEATURES/59187
deleted file mode 100644
index c53c5b2f5fe..00000000000
--- a/FEATURES/59187
+++ /dev/null
@@ -1,10 +0,0 @@
- '59187' =>
- ['Label' => $this->_('[Explo] Redmine : pouvoir uploader des fichiers dans les tickets back office'),
- 'Desc' => '',
- 'Image' => '',
- 'Video' => '',
- 'Category' => '',
- 'Right' => function($feature_description, $user) {return true;},
- 'Wiki' => '',
- 'Test' => '',
- 'Date' => '2017-09-28'],
\ No newline at end of file
diff --git a/VERSIONS b/VERSIONS
index 3c29f5afe39..8b5dcae537d 100644
--- a/VERSIONS
+++ b/VERSIONS
@@ -1,3 +1,8 @@
+09/10/2017 - v7.10.6
+
+ - ticket #59187 : [Explo] Redmine : pouvoir uploader des fichiers dans les tickets back office
+
+
02/10/2017 - v7.10.5
- ticket #65353 : Correction du lien réserver.
diff --git a/VERSIONS_WIP/59187 b/VERSIONS_WIP/59187
deleted file mode 100644
index 0a50e0f9959..00000000000
--- a/VERSIONS_WIP/59187
+++ /dev/null
@@ -1 +0,0 @@
- - ticket #59187 : [Explo] Redmine : pouvoir uploader des fichiers dans les tickets back office
\ No newline at end of file
diff --git a/library/startup.php b/library/startup.php
index 622c31d8513..c9fd9ed8fbe 100644
--- a/library/startup.php
+++ b/library/startup.php
@@ -82,7 +82,7 @@ class Bokeh_Engine {
function setupConstants() {
defineConstant('BOKEH_MAJOR_VERSION','7.10');
- defineConstant('BOKEH_RELEASE_NUMBER', BOKEH_MAJOR_VERSION . '.5');
+ defineConstant('BOKEH_RELEASE_NUMBER', BOKEH_MAJOR_VERSION . '.6');
defineConstant('BOKEH_REMOTE_FILES', 'http://git.afi-sa.fr/afi/opacce/');
--
GitLab