mirror of
https://github.com/Combodo/iTop.git
synced 2026-02-13 07:24:13 +01:00
# Conflicts: # .jenkins/bin/tests/phpunit.sh # Jenkinsfile # core/config.class.inc.php # core/dbobjectsearch.class.php # core/ormlinkset.class.inc.php # datamodels/2.x/combodo-db-tools/dbtools.php # dictionaries/nl.dictionary.itop.ui.php