mirror of
https://github.com/Combodo/iTop.git
synced 2026-05-19 23:32:17 +02:00
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
# Conflicts: # js/wizardhelper.js
This commit is contained in:
# Conflicts: # js/wizardhelper.js