mirror of
https://github.com/Combodo/iTop.git
synced 2026-09-08 22:38:22 +02:00
Merge branch 'support/3.2' into develop
# Conflicts: # core/attributedef.class.inc.php
This commit is contained in:
# Conflicts: # core/attributedef.class.inc.php