SuiteCRM-Core/public/legacy/modules/ACL
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
..
language Merge commit '8e4cc94994' as 'public/legacy' 2021-03-31 15:37:32 +01:00
metadata Merge commit '8e4cc94994' as 'public/legacy' 2021-03-31 15:37:32 +01:00
ACLController.php Merge commit '8e4cc94994' as 'public/legacy' 2021-03-31 15:37:32 +01:00
ACLJSController.php Merge commit '8e4cc94994' as 'public/legacy' 2021-03-31 15:37:32 +01:00
Forms.php Merge commit '8e4cc94994' as 'public/legacy' 2021-03-31 15:37:32 +01:00
install_actions.php Merge commit '114b895b6d' into merge_develop 2021-08-30 10:18:23 +01:00
List.php Merge commit '8e4cc94994' as 'public/legacy' 2021-03-31 15:37:32 +01:00
Menu.php Merge commit '8e4cc94994' as 'public/legacy' 2021-03-31 15:37:32 +01:00
remove_actions.php Merge commit '8e4cc94994' as 'public/legacy' 2021-03-31 15:37:32 +01:00
Save.php Merge commit '8e4cc94994' as 'public/legacy' 2021-03-31 15:37:32 +01:00
vardefs.php Merge commit '8e4cc94994' as 'public/legacy' 2021-03-31 15:37:32 +01:00