Merge remote-tracking branch 'origin/develop' into feature/backoffice-full-moon-design

This commit is contained in:
Molkobain
2020-07-30 15:23:06 +02:00
44 changed files with 260 additions and 91 deletions

View File

@@ -22,7 +22,7 @@
define('ITOP_APPLICATION', 'iTop');
define('ITOP_APPLICATION_SHORT', 'iTop');
define('ITOP_VERSION', '2.7.0-dev');
define('ITOP_VERSION', '2.8.0-dev');
define('ITOP_REVISION', 'svn');
define('ITOP_BUILD_DATE', '$WCNOW$');
define('ITOP_VERSION_FULL', ITOP_VERSION.'-'.ITOP_REVISION);