From dcb2f3ebc335e64225ac29e5c6f2cabf7133dbbd Mon Sep 17 00:00:00 2001
From: gloas <gloas@afi-sa.fr>
Date: Tue, 24 Apr 2018 17:01:47 +0200
Subject: [PATCH] version 7.12.13
---
VERSIONS | 8 ++++++++
VERSIONS_HOTLINE/74605 | 2 --
VERSIONS_WIP/72285 | 1 -
library/startup.php | 2 +-
4 files changed, 9 insertions(+), 4 deletions(-)
delete mode 100644 VERSIONS_HOTLINE/74605
delete mode 100644 VERSIONS_WIP/72285
diff --git a/VERSIONS b/VERSIONS
index 315d869f283..57de294981f 100644
--- a/VERSIONS
+++ b/VERSIONS
@@ -1,3 +1,11 @@
+24/04/2018 - v7.12.13
+
+ - ticket #72285 : correction: si une zone de lien contient une URL relative, le lien reste relatif
+
+ - ticket #74605 : Administration : correction de l'ajout d'images dans les articles.
+
+
+
23/04/2018 - v7.12.12
- ticket #74541 : Administration : correction de l'affichage de la popup des listes de fonctionnalités
diff --git a/VERSIONS_HOTLINE/74605 b/VERSIONS_HOTLINE/74605
deleted file mode 100644
index 3d87af72008..00000000000
--- a/VERSIONS_HOTLINE/74605
+++ /dev/null
@@ -1,2 +0,0 @@
- - ticket #74605 : Administration : correction de l'ajout d'images dans les articles.
-
\ No newline at end of file
diff --git a/VERSIONS_WIP/72285 b/VERSIONS_WIP/72285
deleted file mode 100644
index 26b91df9d53..00000000000
--- a/VERSIONS_WIP/72285
+++ /dev/null
@@ -1 +0,0 @@
- - ticket #72285 : correction: si une zone de lien contient une URL relative, le lien reste relatif
\ No newline at end of file
diff --git a/library/startup.php b/library/startup.php
index 26303c09498..42a326c49bd 100644
--- a/library/startup.php
+++ b/library/startup.php
@@ -82,7 +82,7 @@ class Bokeh_Engine {
function setupConstants() {
defineConstant('BOKEH_MAJOR_VERSION','7.12');
- defineConstant('BOKEH_RELEASE_NUMBER', BOKEH_MAJOR_VERSION . '.12');
+ defineConstant('BOKEH_RELEASE_NUMBER', BOKEH_MAJOR_VERSION . '.13');
defineConstant('BOKEH_REMOTE_FILES', 'http://git.afi-sa.fr/afi/opacce/');
--
GitLab