Dillon-Brown
|
35ada7898d
|
Merge commit '9c71e8c884 ' into fix/legacy_update
Signed-off-by: Dillon-Brown <dillon.brown@salesagility.com>
# Conflicts:
# public/legacy/.gitignore
# public/legacy/composer.json
# public/legacy/composer.lock
# public/legacy/include/language/en_us.lang.php
# public/legacy/modules/Administration/Search/View.php
# public/legacy/modules/Administration/metadata/adminpaneldefs.php
# public/legacy/modules/Home/UnifiedSearch.php
# public/legacy/modules/Home/UnifiedSearchAdvanced.php
# public/legacy/tests/unit/phpunit/include/utils/fileUtilsTest.php
# public/legacy/tests/unit/phpunit/modules/AOD_Index/AOD_IndexTest.php
# public/legacy/tests/unit/phpunit/modules/AOD_IndexEvent/AOD_IndexEventTest.php
|
2021-07-29 16:53:55 +01:00 |
|