Molkobain
|
3bec96abe1
|
Merge remote-tracking branch 'origin/support/3.0' into develop
# Conflicts:
# core/config.class.inc.php
# setup/itopdesignformat.class.inc.php
|
2022-01-27 16:09:22 +01:00 |
|
Molkobain
|
ff7d1f2d6a
|
Merge remote-tracking branch 'origin/support/3.0' into develop
|
2022-01-17 19:21:52 +01:00 |
|
Molkobain
|
812606db78
|
Merge remote-tracking branch 'origin/support/3.0' into develop
# Conflicts:
# core/config.class.inc.php
|
2022-01-12 15:54:18 +01:00 |
|
Pierre Goiffon
|
5f575d524a
|
N°4621 Fix naming inconsistencies in sources/*
|
2021-12-31 15:44:59 +01:00 |
|