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

# Conflicts:
#	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

2020-10-14 09:19:07 +02:00

..

2.x

Merge remote-tracking branch 'origin/support/2.6' into support/2.7

2020-10-14 09:19:07 +02:00

.htaccess

N°2498 - Authorize map extension

2020-02-06 14:05:08 +01:00

web.config

N°2498 - Authorize map extension

2020-02-06 14:05:08 +01:00