Commit graph

3 commits

Author SHA1 Message Date
Jack Anderson
10efe5a340 Merge next into suite 8 2023-01-24 10:56:09 +00:00
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
11be803da2 Merge commit '8e4cc94994' as 'public/legacy' 2021-03-31 15:37:32 +01:00