mirror of
https://github.com/Combodo/iTop.git
synced 2026-02-13 07:24:13 +01:00
# Conflicts: # sources/Core/Email/EmailSwiftMailer.php # tests/php-unit-tests/integration-tests/DictionariesConsistencyTest.php # tests/php-unit-tests/postbuild_integration.xml.dist