mirror of
https://github.com/Combodo/iTop.git
synced 2026-03-04 08:34:11 +01:00
# Conflicts: # sources/Forms/Block/AbstractFormBlock.php # sources/Forms/Block/DataModel/AttributeValueChoiceFormBlock.php # templates/application/forms/itop_console_layout.html.twig