From 3d10b6fbcb59f03a243aac81bb837e9a900f5e56 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Fri, 22 Aug 2008 01:17:10 +0000
Subject: [PATCH] Merge 2.4

---
 doc/install/.htpasswd  | 1 -
 htdocs/install/inc.php | 2 +-
 htdocs/master.inc.php  | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)
 delete mode 100644 doc/install/.htpasswd

diff --git a/doc/install/.htpasswd b/doc/install/.htpasswd
deleted file mode 100644
index 213d6352a1b..00000000000
--- a/doc/install/.htpasswd
+++ /dev/null
@@ -1 +0,0 @@
-admin:$apr1$l63.....$tCO2YgYkr.oq.ShBECwUH1
diff --git a/htdocs/install/inc.php b/htdocs/install/inc.php
index fd8220b2cfd..0b8694f9eef 100644
--- a/htdocs/install/inc.php
+++ b/htdocs/install/inc.php
@@ -24,7 +24,7 @@
 		\version    $Id$
 */
 
-define('DOL_VERSION','2.4-beta');	// Also defined in htdocs/master.inc.php
+define('DOL_VERSION','2.4');	// Also defined in htdocs/master.inc.php
 
 require_once('../translate.class.php');
 require_once('../lib/functions.lib.php');
diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php
index 18d8840e7d4..e3ade0f4a36 100644
--- a/htdocs/master.inc.php
+++ b/htdocs/master.inc.php
@@ -29,7 +29,7 @@
    \version    $Id$
 */
 
-define('DOL_VERSION','2.4-beta');	// Also defined in htdocs/install/inc.php
+define('DOL_VERSION','2.4');	// Also defined in htdocs/install/inc.php
 define('EURO',chr(128)); 
 
 // La fonction clearstatcache ne doit pas etre appelée de manière globale car ralenti.