Pierre Goiffon db593ff85e Merge remote-tracking branch 'origin/support/2.6' into support/2.7 ...

# Conflicts:
#	application/loginwebpage.class.inc.php
#	application/menunode.class.inc.php
#	datamodels/2.x/itop-portal-base/portal/src/controllers/aggregatepagebrickcontroller.class.inc.php
#	datamodels/2.x/itop-portal-base/portal/src/controllers/userprofilebrickcontroller.class.inc.php
#	datamodels/2.x/itop-portal-base/portal/src/views/bricks/manage/popup-export-excel.html.twig
#	pages/ajax.render.php

2020-04-20 16:05:56 +02:00

58 KiB

Raw Blame History

View Raw