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

4 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
Clemente Raposo
b9e45ecc54 Merge next into suite 8 2022-05-17 19:03:14 +01:00
Dillon-Brown
33fc2ee307 Merge commit '114b895b6d' into merge_develop 
Signed-off-by: Dillon-Brown <dillon.brown@salesagility.com>

# Conflicts:
#	public/legacy/include/CleanCSV.php
#	public/legacy/suitecrm_version.php
#	public/legacy/tests/unit/phpunit/includes/CleanCSVTest.php
 2021-08-30 10:18:23 +01:00
Dillon-Brown
11be803da2 Merge commit '8e4cc94994' as 'public/legacy' 2021-03-31 15:37:32 +01:00