mirror of
https://github.com/Combodo/iTop.git
synced 2026-07-10 00:36:41 +02:00
# Conflicts: # core/attributedef.class.inc.php # css/backoffice/_shame.scss # pages/csvimport.php
# Conflicts: # core/attributedef.class.inc.php # css/backoffice/_shame.scss # pages/csvimport.php