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
..
2020-04-06 09:42:41 +02:00
2019-11-08 16:51:57 +01:00
2020-04-14 17:56:27 +02:00
2019-11-08 16:51:57 +01:00
2019-11-08 16:51:57 +01:00
2020-04-20 16:05:56 +02:00
2019-11-08 16:51:57 +01:00
2019-11-08 16:51:57 +01:00
2018-10-18 14:20:40 +02:00
2019-11-08 16:51:57 +01:00
2019-11-08 16:51:57 +01:00
2020-01-15 08:42:35 +01:00
2019-11-08 16:51:57 +01:00
2019-12-12 15:46:03 +01:00
2019-12-20 09:21:00 +01:00
2020-03-31 09:40:31 +02:00
2019-11-08 16:51:57 +01:00
2020-03-30 16:13:47 +02:00
2019-11-08 16:51:57 +01:00