3 commits

Author	SHA1	Message	Date
Jack Anderson	8c553f7c3c	Merge next into suite 8	2023-06-30 10:54:51 +01:00
Dillon-Brown	561d2f71a6	Merge commit '2473298dc6' into beta2 ... # Conflicts: # public/legacy/composer.json # public/legacy/composer.lock # public/legacy/modules/AOD_Index/AOD_Index.php # public/legacy/modules/AOD_Index/AOD_Index_sugar.php # public/legacy/modules/AOD_Index/AOD_LogicHooks.php # public/legacy/modules/AOD_Index/LuceneUtils.php # public/legacy/modules/AOD_Index/PdfParser.php # public/legacy/modules/AOD_Index/controller.php # public/legacy/modules/AOD_Index/views/view.indexdata.php # public/legacy/modules/AOD_IndexEvent/AOD_IndexEvent_sugar.php # public/legacy/modules/SavedSearch/metadata/SearchFields.php # public/legacy/modules/Schedulers/_AddJobsHere.php	2021-05-20 11:55:03 +01:00
Dillon-Brown	11be803da2	Merge commit '8e4cc94994' as 'public/legacy'	2021-03-31 15:37:32 +01:00