Stephen Abello
|
47e7c35c2b
|
Merge branch 'support/3.0' into support/3.1
# Conflicts:
# dictionaries/cs.dictionary.itop.core.php
# dictionaries/da.dictionary.itop.core.php
# dictionaries/de.dictionary.itop.core.php
# dictionaries/es_cr.dictionary.itop.core.php
# dictionaries/hu.dictionary.itop.core.php
# dictionaries/it.dictionary.itop.core.php
# dictionaries/ja.dictionary.itop.core.php
# dictionaries/nl.dictionary.itop.core.php
# dictionaries/pl.dictionary.itop.core.php
# dictionaries/pt_br.dictionary.itop.core.php
# dictionaries/ru.dictionary.itop.core.php
# dictionaries/sk.dictionary.itop.core.php
# dictionaries/tr.dictionary.itop.core.php
# lib/composer/autoload_classmap.php
# lib/composer/autoload_static.php
# sources/Application/Helper/ExportHelper.php
|
2023-11-21 10:24:29 +01:00 |
|