From 9bbc1be22f6590e09cace70ae34274e1b1b144f1 Mon Sep 17 00:00:00 2001
From: Ghislain Loas <ghislo@sandbox.pergame.net>
Date: Mon, 29 Feb 2016 11:42:44 +0100
Subject: [PATCH] version 7.4.14

---
 VERSIONS               | 8 ++++++++
 VERSIONS_HOTLINE/37405 | 1 -
 VERSIONS_HOTLINE/38194 | 1 -
 library/startup.php    | 2 +-
 4 files changed, 9 insertions(+), 3 deletions(-)
 delete mode 100644 VERSIONS_HOTLINE/37405
 delete mode 100644 VERSIONS_HOTLINE/38194

diff --git a/VERSIONS b/VERSIONS
index ac7678f95a7..46255a3410b 100644
--- a/VERSIONS
+++ b/VERSIONS
@@ -1,3 +1,11 @@
+29/02/2016 - v7.4.14
+
+ - ticket #37405 : Administration : correction de l'affichage du tableau d'assistance
+
+ - ticket #38194 : Cosmogramme : Correction de la perte des facettes de tags lors d'un réimport de notice
+
+
+
 25/02/2016 - v7.4.13
 
  - ticket #38236 : Administration : Correction du selecteur de Territoire dans la fiche Bibliothèque
diff --git a/VERSIONS_HOTLINE/37405 b/VERSIONS_HOTLINE/37405
deleted file mode 100644
index f8402845d9d..00000000000
--- a/VERSIONS_HOTLINE/37405
+++ /dev/null
@@ -1 +0,0 @@
- - ticket #37405 : Problème d'affichage de la forge l'interface d'administration Bokeh
\ No newline at end of file
diff --git a/VERSIONS_HOTLINE/38194 b/VERSIONS_HOTLINE/38194
deleted file mode 100644
index ee8e9f23dc2..00000000000
--- a/VERSIONS_HOTLINE/38194
+++ /dev/null
@@ -1 +0,0 @@
- - ticket #38194 : Cosmogramme : Correction de la perte des facettes de tags lors d'un réimport de notice
\ No newline at end of file
diff --git a/library/startup.php b/library/startup.php
index c6a96728a59..9ab359ac83c 100644
--- a/library/startup.php
+++ b/library/startup.php
@@ -64,7 +64,7 @@ function defineConstant($name, $value) {
 
 function setupConstants() {
   defineConstant('BOKEH_MAJOR_VERSION','7.4');
-  defineConstant('BOKEH_RELEASE_NUMBER', BOKEH_MAJOR_VERSION . '.13');
+  defineConstant('BOKEH_RELEASE_NUMBER', BOKEH_MAJOR_VERSION . '.14');
 
   defineConstant('BOKEH_REMOTE_FILES', 'http://git.afi-sa.fr/afi/opacce/');
 
-- 
GitLab