4 Commits

Author	SHA1	Message	Date
Molkobain	4d4cdf9e60	Merge remote-tracking branch 'origin/support/3.0' into support/3.1	2024-01-24 15:18:37 +01:00
Molkobain	3868d57d28	Merge remote-tracking branch 'origin/support/2.7' into support/3.0	2024-01-24 15:11:29 +01:00
Pierre Goiffon	200cdefa1a	Merge remote-tracking branch 'origin/support/3.0' into support/3.1 ... # Conflicts: # datamodels/2.x/itop-core-update/dictionaries/pt_br.dict.itop-core-update.php # datamodels/2.x/itop-hub-connector/dictionaries/pl.dict.itop-hub-connector.php # datamodels/2.x/itop-hub-connector/dictionaries/pt_br.dict.itop-hub-connector.php # datamodels/2.x/itop-hub-connector/dictionaries/zh_cn.dict.itop-hub-connector.php # datamodels/2.x/itop-welcome-itil/dictionaries/tr.dict.itop-welcome-itil.php	2024-01-15 15:44:48 +01:00
Pierre Goiffon	8ef04bedf2	N°7143 Move datamodels/2.x dict files to dictionaries subdir ... New phpunit method to ensure it won't happen again	2024-01-15 15:35:15 +01:00