Eric e68340273b Merge branch 'master' into develop ...

# Conflicts:
#	core/config.class.inc.php
#	core/htmlsanitizer.class.inc.php
#	css/css-variables.scss
#	css/light-grey.css
#	datamodels/2.x/version.xml
#	dictionaries/zh_cn.dictionary.itop.ui.php
#	synchro/synchrodatasource.class.inc.php

2019-06-20 16:11:38 +02:00

146 KiB

Raw Blame History

View Raw