SuiteCRM-Core/public/legacy/Api/V8/Controller
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
..
InvocationStrategy Merge commit '8e4cc94994' as 'public/legacy' 2021-03-31 15:37:32 +01:00
BaseController.php Merge commit '8e4cc94994' as 'public/legacy' 2021-03-31 15:37:32 +01:00
ListViewController.php Merge commit '8e4cc94994' as 'public/legacy' 2021-03-31 15:37:32 +01:00
ListViewSearchController.php Merge commit '8e4cc94994' as 'public/legacy' 2021-03-31 15:37:32 +01:00
LogoutController.php Merge commit '8e4cc94994' as 'public/legacy' 2021-03-31 15:37:32 +01:00
MetaController.php Merge commit '8e4cc94994' as 'public/legacy' 2021-03-31 15:37:32 +01:00
ModuleController.php Merge commit '8e4cc94994' as 'public/legacy' 2021-03-31 15:37:32 +01:00
RelationshipController.php Merge commit '2473298dc6' into beta2 2021-05-20 11:55:03 +01:00
UserController.php Merge commit '8e4cc94994' as 'public/legacy' 2021-03-31 15:37:32 +01:00
UserPreferencesController.php Merge commit '8e4cc94994' as 'public/legacy' 2021-03-31 15:37:32 +01:00