From 41b61d8096b59e9f46407550820598b6b9ff79fa Mon Sep 17 00:00:00 2001
From: Ghislain Loas <ghislo@sandbox.pergame.net>
Date: Tue, 19 Jan 2016 10:01:57 +0100
Subject: [PATCH] version 7.5.1

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

diff --git a/VERSIONS b/VERSIONS
index eb03ce96794..8097fa59695 100644
--- a/VERSIONS
+++ b/VERSIONS
@@ -1,3 +1,9 @@
+19/01/2016 - v7.4.1
+
+ - ticket #36687 : Correction d'une ambiguité sur les requetes sql des catalogues
+
+
+
 18/01/2016 - v7.4.0
 
  - ticket #33379 : Intégration des demandes d'assistance
diff --git a/VERSIONS_HOTLINE/36687 b/VERSIONS_HOTLINE/36687
deleted file mode 100644
index 7c2578c9401..00000000000
--- a/VERSIONS_HOTLINE/36687
+++ /dev/null
@@ -1 +0,0 @@
- - ticket #36687 : Correction d'une ambiguité sur les requetes sql des catalogues
diff --git a/library/startup.php b/library/startup.php
index 7bf1e935f9d..e75be903c1d 100644
--- a/library/startup.php
+++ b/library/startup.php
@@ -63,8 +63,8 @@ function defineConstant($name, $value) {
 
 
 function setupConstants() {
-  defineConstant('BOKEH_MAJOR_VERSION','7.4');
-  defineConstant('BOKEH_RELEASE_NUMBER', BOKEH_MAJOR_VERSION . '.0');
+  defineConstant('BOKEH_MAJOR_VERSION','7.5');
+  defineConstant('BOKEH_RELEASE_NUMBER', BOKEH_MAJOR_VERSION . '.1');
 
   defineConstant('BOKEH_REMOTE_FILES', 'http://git.afi-sa.fr/afi/opacce/');
 
-- 
GitLab