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