composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-03-17 06:54:21 +01:00
Code Issues Packages Projects Releases Wiki Activity
10,960 Commits 140 Branches 134 Tags
05b69208a802f1869d73b5f2032b94de690eda76
Commit Graph

3 Commits

Author SHA1 Message Date
Pierre Goiffon
ddd6bf22af Merge remote-tracking branch 'origin/support/2.7' into develop 
# Conflicts:
#	core/attributedef.class.inc.php
#	core/config.class.inc.php
#	core/htmlsanitizer.class.inc.php
#	sources/Renderer/RenderingOutput.php
#	test/core/sanitizer/HTMLDOMSanitizerTest.php
#	test/integration/DictionariesConsistencyTest.php
 2021-11-24 15:01:38 +01:00
Pierre Goiffon
efaf53e568 Merge remote-tracking branch 'origin/support/2.6' into support/2.7 
# Conflicts:
#	core/htmlsanitizer.class.inc.php
 2021-11-23 18:07:02 +01:00
Pierre Goiffon
e15d4bfab6 N°4360 Security hardening 2021-11-23 17:25:50 +01:00