Molkobain 38640b01a8 Merge branch 'feature/b2060-migrate-silex-to-symfony' into develop ...

# Conflicts:
#	core/dbsearch.class.php
#	datamodels/2.x/itop-portal-base/module.itop-portal-base.php
#	datamodels/2.x/itop-portal-base/portal/src/controllers/userprofilebrickcontroller.class.inc.php
#	datamodels/2.x/itop-portal-base/portal/src/helpers/applicationhelper.class.inc.php
#	datamodels/2.x/itop-portal/module.itop-portal.php

2019-07-12 09:57:16 +02:00

81 KiB

Raw Blame History

View Raw