mirror of
https://github.com/Combodo/iTop.git
synced 2026-05-18 06:48:50 +02:00
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
# Conflicts: # pages/preferences.php
This commit is contained in:
# Conflicts: # pages/preferences.php