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
..
language	Indentation fix	2021-08-19 13:53:32 +01:00
AOR_Condition.php	Remove PHP4 constructors	2021-03-26 21:50:24 +00:00
conditionLines.js	Fixed #7315 - Adding parameter date field in Reports module causes error in Browser console	2019-07-26 15:50:28 +05:30
conditionLines.php	Replace explicit bean instantiations in files 581 - 583	2020-01-22 13:51:59 +00:00
vardefs.php	no_trailing_whitespace + no_trailing_whitespace_in_comment	2019-01-25 14:24:15 +00:00