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	Copyright revision	2018-12-31 14:25:24 +00:00
lib/pChart	Fix pChart lib encoding issue	2021-03-26 21:50:24 +00:00
AOR_Chart.php	Merge remote-tracking branch 'public/hotfix' into develop_history_fix	2021-09-08 15:25:21 +01:00
chartLines.js	Restyling AOR edit view	2017-08-11 15:31:11 +01:00
controller.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
vardefs.php	Wrong spelling of AOR_Reports module	2021-08-19 13:53:32 +01:00