SuiteCRM/SuiteCRM-Core
2
0
Fork 0
mirror of https://github.com/SuiteCRM/SuiteCRM-Core.git synced 2025-09-04 10:14:13 +08:00
Code Issues Projects Packages Activity Actions
3162 commits 5 branches 39 tags 48 MiB
Commit graph

3 commits

Author SHA1 Message Date
Clemente Raposo
123e5a9f26 Merge commit '9d484f189a' into release/8.2.2 
# Conflicts:
#	public/legacy/files.md5
#	public/legacy/modules/InboundEmail/EditView.html
#	public/legacy/modules/Users/tpls/EditViewFooter.tpl
#	public/legacy/suitecrm_version.php
 2022-12-21 11:49:42 +00:00
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
Dillon-Brown
11be803da2 Merge commit '8e4cc94994' as 'public/legacy' 2021-03-31 15:37:32 +01:00