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
..
forms	Merge remote-tracking branch 'remotes/origin/hotfix-7.10.x' into hotfix	2019-10-23 11:10:20 +01:00
implements	PSR-2	2019-02-01 12:17:24 +00:00
templates	Merge remote-tracking branch 'public/hotfix' into develop_history_fix	2021-09-08 15:25:21 +01:00
LanguageManager.php	Merge remote-tracking branch 'upstream/hotfix-7.10.x' into hotfix	2019-09-20 14:53:13 +01:00
SugarConfig.php	switch_case_semicolon_to_colon + switch_case_space + visibility_required	2019-01-25 14:28:56 +00:00
SugarRegistry.php	single_blank_line_at_eof + single_class_element_per_statement + single_import_per_statement + single_line_after_imports	2019-01-25 14:26:18 +00:00
SugarSession.php	braces	2019-01-25 13:51:46 +00:00
translated_prefix.php	single_blank_line_at_eof + single_class_element_per_statement + single_import_per_statement + single_line_after_imports	2019-01-25 14:26:18 +00:00
VardefManager.php	Merge remote-tracking branch 'remotes/origin/hotfix-7.10.x' into hotfix	2019-10-23 11:10:20 +01:00