Dillon-Brown 80cd01baa7 Merge remote-tracking branch 'public/hotfix' into develop_history_fix ... # Conflicts: # composer.json # composer.lock # include/javascript/jquery.js # include/utils/php_zip_utils.php # include/utils/zip_utils.php		2021-09-08 15:25:21 +01:00
..
Controller	Merge remote-tracking branch 'public/hotfix' into develop_history_fix	2021-09-08 15:25:21 +01:00
View	Remove PHP4 constructors	2021-03-26 21:50:24 +00:00
preDispatch.php	no_trailing_whitespace + no_trailing_whitespace_in_comment	2019-01-25 14:24:15 +00:00
SugarApplication.php	Merge remote-tracking branch 'public/hotfix' into develop_history_fix	2021-09-08 15:25:21 +01:00
SugarModule.php	no_spaces_after_function_name + no_spaces_inside_parenthesis	2019-01-25 14:22:15 +00:00