Molkobain
|
c3140c2db3
|
Copyright year bump
|
2021-03-12 18:48:46 +01:00 |
|
bruno-ds
|
9cbaced1f3
|
Merge remote-tracking branch 'origin/support/2.7' into develop
# Conflicts:
# core/config.class.inc.php
# datamodels/2.x/itop-core-update/view/SelectUpdateFile.html.twig
# datamodels/2.x/itop-core-update/view/SelectUpdateFile.ready.js.twig
# setup/setuputils.class.inc.php
# test/setup/SetupUtilsTest.php
|
2021-03-02 14:34:19 +01:00 |
|
bruno-ds
|
26bbdc1a57
|
Merge remote-tracking branch 'origin/support/2.7' into develop
# Conflicts:
# application/cmdbabstract.class.inc.php
# application/utils.inc.php
# dictionaries/en.dictionary.itop.core.php
# dictionaries/fr.dictionary.itop.core.php
# setup/setuputils.class.inc.php
|
2021-02-23 08:58:29 +01:00 |
|
Molkobain
|
71dbccd034
|
N°3216 - Refactor form files to be part of the autoloader
|
2020-07-30 15:22:16 +02:00 |
|