mirror of
https://github.com/Combodo/iTop.git
synced 2026-02-13 07:24:13 +01:00
# Conflicts: # application/applicationextension.inc.php # core/attributedef.class.inc.php # core/cmdbchangeop.class.inc.php # core/cmdbobject.class.inc.php # core/dbobjectsearch.class.php # core/oql/expression.class.inc.php # core/oql/oql-lexer.plex # core/oql/oql-parser.y # core/oql/oqlquery.class.inc.php # css/light-grey.scss # datamodels/2.x/itop-full-itil/datamodel.itop-full-itil.xml # datamodels/2.x/itop-portal/datamodel.itop-portal.xml # datamodels/2.x/itop-tickets/en.dict.itop-tickets.php # dictionaries/en.dictionary.itop.core.php # dictionaries/fr.dictionary.itop.core.php # setup/xmldataloader.class.inc.php # test/ItopDataTestCase.php