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
..
2018-05-14 07:41:51 +00:00
2014-07-15 09:21:47 +00:00
2019-01-09 09:24:07 +01:00
2014-07-15 09:21:47 +00:00
2019-02-21 17:18:29 +01:00
2018-11-13 11:18:10 +01:00
2019-06-20 16:11:38 +02:00
2019-04-30 16:11:29 +02:00
2019-01-07 16:46:29 +01:00
2013-12-03 11:04:33 +00:00
2018-12-31 17:21:52 +01:00
2016-08-29 12:47:06 +00:00
2012-04-18 14:57:57 +00:00
2018-10-22 17:11:07 +02:00
2009-04-28 09:03:12 +00:00
2018-11-30 14:28:26 +01:00
2018-10-18 14:20:40 +02:00
2018-10-18 14:20:40 +02:00
2018-11-13 11:18:10 +01:00
2009-04-28 09:03:12 +00:00
2018-04-20 15:56:53 +00:00
2019-01-09 11:03:05 +01:00
2019-01-09 11:03:05 +01:00
2019-06-03 12:36:05 +02:00
2019-02-21 17:18:29 +01:00
2018-10-18 14:20:40 +02:00
2019-06-20 16:11:38 +02:00
2019-01-09 10:51:11 +01:00
2019-05-23 10:52:34 +02:00
2018-10-18 14:20:40 +02:00