Pierre Goiffon
f871581997
Merge branch 'develop' into feature/b931
# 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
2018-09-04 18:02:51 +02:00
..
2018-08-03 08:43:36 +00:00
2018-03-29 09:17:44 +00:00
2018-09-04 17:59:51 +02:00
2018-09-04 17:59:51 +02:00
2018-08-03 08:43:36 +00:00
2018-06-27 15:14:19 +00:00
2018-09-04 18:02:51 +02:00
2018-09-04 17:59:51 +02:00
2018-09-04 17:59:51 +02:00
2018-08-03 08:43:36 +00:00
2018-07-18 07:51:17 +00:00
2018-09-04 18:02:51 +02:00
2018-07-19 08:45:39 +00:00
2018-09-04 17:59:51 +02:00
2018-03-29 09:17:44 +00:00
2018-09-04 17:59:51 +02:00
2018-09-04 17:59:51 +02:00
2018-08-03 08:43:36 +00:00
2018-09-04 17:59:51 +02:00
2018-09-04 17:59:51 +02:00
2018-09-04 17:59:51 +02:00
2018-09-04 17:59:51 +02:00
2018-09-04 17:59:51 +02:00
2018-08-03 08:43:36 +00:00
2018-03-29 09:17:44 +00:00
2018-09-04 17:59:51 +02:00
2018-09-04 17:59:51 +02:00
2018-09-04 17:59:51 +02:00
2018-09-04 17:59:51 +02:00