Skip to content

Commit

Permalink
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Browse files Browse the repository at this point in the history
Conflicts:
	htdocs/filefunc.inc.php
  • Loading branch information
eldy committed Jul 1, 2019
2 parents 0259cde + ef27e32 commit edd4d07
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion htdocs/filefunc.inc.php
Expand Up @@ -31,7 +31,7 @@
*/

if (! defined('DOL_APPLICATION_TITLE')) define('DOL_APPLICATION_TITLE', 'Dolibarr');
if (! defined('DOL_VERSION')) define('DOL_VERSION', '10.0.0'); // a.b.c-alpha, a.b.c-beta, a.b.c-rcX or a.b.c
if (! defined('DOL_VERSION')) define('DOL_VERSION', '10.0.1'); // a.b.c-alpha, a.b.c-beta, a.b.c-rcX or a.b.c

if (! defined('EURO')) define('EURO', chr(128));

Expand Down

0 comments on commit edd4d07

Please sign in to comment.