composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-02-13 07:24:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/support/2.7' into develop

Browse Source 
# Conflicts:
#	js/utils.js
This commit is contained in:
Pierre Goiffon
2021-11-03 11:19:23 +01:00
parent e963a6741f 8c7f7abaab
commit 04f7660267
2 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
js/utils.js
View File

@@ -666,7 +666,7 @@ Dict.Format = function () {
var args = Array.from(arguments);
args[0] = Dict.S(arguments[0]);
return Format(args);
}
};
// TODO 3.0.0: Move functions above either in CombodoGlobalToolbox or CombodoBackofficeToolbox and deprecate them
/**
@@ -1073,4 +1073,4 @@ const CombodoSanitizer = {
return sEncodedValue;
}
}
};