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
..
Dashlets/SugarFeedDashlet	Remove PHP4 constructors	2021-03-26 21:50:24 +00:00
language	Notes for abbreviations, VAT, Activity Stream, SAML	2021-08-19 13:53:32 +01:00
linkHandlers	Replace deprecated array accessors in a few more files.	2019-10-08 11:26:30 -06:00
metadata	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
tpls	fix part 2	2018-08-02 19:01:56 +01:00
views	Merge branch 'hotfix-7.10.x' into hotfix	2020-03-30 10:50:29 +01:00
action_view_map.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
AdminSettings.php	Merge branch 'hotfix-7.10.x' into hotfix	2020-03-30 10:50:29 +01:00
feedLogicBase.php	switch_case_semicolon_to_colon + switch_case_space + visibility_required	2019-01-25 14:28:56 +00:00
Forms.php	initial commit	2013-09-23 20:30:44 +01:00
Menu.php	Removed unused description headers	2019-10-14 14:12:09 +01:00
SugarFeed.php	Remove PHP4 constructors	2021-03-26 21:50:24 +00:00
SugarFeedFlush.php	Replace explicit bean instantiations in files 501 - 510	2020-01-22 13:51:48 +00:00
vardefs.php	Fix #8904 - Optimistic locking module definition incorrectly set on some modules	2020-10-26 21:58:38 +00:00