Merge 2.4
This commit is contained in:
parent
42454d3205
commit
3d10b6fbcb
@ -1 +0,0 @@
|
|||||||
admin:$apr1$l63.....$tCO2YgYkr.oq.ShBECwUH1
|
|
||||||
@ -24,7 +24,7 @@
|
|||||||
\version $Id$
|
\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('../translate.class.php');
|
||||||
require_once('../lib/functions.lib.php');
|
require_once('../lib/functions.lib.php');
|
||||||
|
|||||||
@ -29,7 +29,7 @@
|
|||||||
\version $Id$
|
\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));
|
define('EURO',chr(128));
|
||||||
|
|
||||||
// La fonction clearstatcache ne doit pas etre appelée de manière globale car ralenti.
|
// La fonction clearstatcache ne doit pas etre appelée de manière globale car ralenti.
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user