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
..
core	Fix #8824 - Too few arguments on SugarWebServiceImpl set_relationship	2020-10-21 13:26:18 +01:00
example	Remove all uses of get_magic_quotes_gpc.	2019-10-16 14:33:34 -06:00
JsonRPCServer	7.11.14	2020-06-10 10:42:30 +01:00
utils	Close #7027 - Use a maintained library to minify JS	2021-03-26 21:50:24 +00:00
v2	Merge branch 'hotfix-7.10.x' into hotfix_merge_14	2019-07-25 13:00:22 +01:00
v2_1	Merge remote-tracking branch 'upstream/hotfix-7.10.x' into fix/merge_statechecker	2019-11-19 14:32:37 +00:00
v3	Retrieve SuiteCRM version in get_server_info	2021-08-19 13:53:32 +01:00
v3_1	Merge branch 'hotfix-7.10.x' into hotfix	2020-03-30 10:50:29 +01:00
v4	Merge branch 'hotfix-7.10.x' into hotfix	2020-03-30 10:50:29 +01:00
v4_1	Merge branch 'hotfix-7.10.x' into hotfix	2020-03-30 10:50:29 +01:00