Molkobain 304e379c01 Merge remote-tracking branch 'origin/support/2.7' into support/3.0 ...

# Conflicts:
#	datamodels/2.x/itop-core-update/cs.dict.itop-core-update.php
#	datamodels/2.x/itop-core-update/da.dict.itop-core-update.php
#	datamodels/2.x/itop-core-update/de.dict.itop-core-update.php
#	datamodels/2.x/itop-core-update/en.dict.itop-core-update.php
#	datamodels/2.x/itop-core-update/es_cr.dict.itop-core-update.php
#	datamodels/2.x/itop-core-update/fr.dict.itop-core-update.php
#	datamodels/2.x/itop-core-update/hu.dict.itop-core-update.php
#	datamodels/2.x/itop-core-update/it.dict.itop-core-update.php
#	datamodels/2.x/itop-core-update/ja.dict.itop-core-update.php
#	datamodels/2.x/itop-core-update/nl.dict.itop-core-update.php
#	datamodels/2.x/itop-core-update/pt_br.dict.itop-core-update.php
#	datamodels/2.x/itop-core-update/ru.dict.itop-core-update.php
#	datamodels/2.x/itop-core-update/sk.dict.itop-core-update.php
#	datamodels/2.x/itop-core-update/tr.dict.itop-core-update.php
#	datamodels/2.x/itop-core-update/view/SelectUpdateFile.html.twig
#	datamodels/2.x/itop-core-update/view/SelectUpdateFile.ready.js.twig
#	datamodels/2.x/itop-core-update/zh_cn.dict.itop-core-update.php

2022-03-09 18:31:34 +01:00

..

userrightsmatrix.class.inc.php

Copyright year bump

2021-03-15 09:29:45 +01:00

userrightsnull.class.inc.php

Copyright year bump

2021-03-15 09:29:45 +01:00

userrightsprofile.class.inc.php

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

2022-03-09 18:31:34 +01:00

userrightsprofile.db.class.inc.php

N°4106 - Remove overloads of DBObject::GetName()

2021-06-28 13:19:41 +02:00

userrightsprojection.class.inc.php

N°4106 - Remove overloads of DBObject::GetName()

2021-06-28 13:19:41 +02:00