mirror of
https://github.com/Combodo/iTop.git
synced 2026-07-04 22:06:38 +02:00
# Conflicts: # sources/Forms/Block/AbstractFormBlock.php # sources/Forms/Block/DataModel/AttributeValueChoiceFormBlock.php # templates/application/forms/itop_console_layout.html.twig