mirror of
https://github.com/Combodo/iTop.git
synced 2026-03-02 15:44:11 +01:00
# Conflicts: # composer.lock # datamodels/2.x/authent-local/dictionaries/pt_br.dict.authent-local.php # dictionaries/fr.dictionary.itop.ui.php # dictionaries/it.dictionary.itop.ui.php # dictionaries/pt_br.dictionary.itop.ui.php # lib/composer/autoload_classmap.php # lib/composer/autoload_static.php # lib/composer/installed.json # lib/composer/installed.php # lib/symfony/cache/Traits/RelayProxy.php # lib/symfony/form/Exception/AccessException.php # lib/symfony/form/Exception/ErrorMappingException.php # lib/symfony/form/Exception/StringCastException.php # lib/symfony/http-foundation/Request.php # lib/symfony/polyfill-intl-icu/composer.json # lib/symfony/property-access/LICENSE # lib/symfony/security-core/Event/AuthenticationSuccessEvent.php