mirror of
https://github.com/Combodo/iTop.git
synced 2026-02-13 15:34:12 +01:00
# Conflicts: # addons/userrights/userrightsprofile.db.class.inc.php # addons/userrights/userrightsprojection.class.inc.php # datamodels/2.x/combodo-backoffice-darkmoon-theme/scss/scss-variables.scss