Pierre Goiffon 45910dc115 Merge remote-tracking branch 'origin/support/2.5' into release/2.6 ...

# Conflicts:
#	datamodels/2.x/itop-config-mgmt/zh.dict.itop-config-mgmt.php
#	dictionaries/zh.dictionary.itop.ui.php

2018-12-11 17:23:34 +01:00

43 KiB

Raw Blame History

View Raw