Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0

Conflicts: htdocs/filefunc.inc.php
Dolibarr · Jul 1, 2019 · ef27e32 · ef27e32
2 parents 6537faa + 3abaecf
commit ef27e32
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php
@@ -31,7 +31,7 @@
  */
 
 if (! defined('DOL_APPLICATION_TITLE')) define('DOL_APPLICATION_TITLE','Dolibarr');
-if (! defined('DOL_VERSION')) define('DOL_VERSION','9.0.4');		// a.b.c-alpha, a.b.c-beta, a.b.c-rcX or a.b.c
+if (! defined('DOL_VERSION')) define('DOL_VERSION','9.0.5');		// a.b.c-alpha, a.b.c-beta, a.b.c-rcX or a.b.c
 
 if (! defined('EURO')) define('EURO',chr(128));