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/AOS_QuotesDashlet	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
metadata	Copyright notice update - Hotfix	2018-08-01 20:14:25 +01:00
templates	Copyright notice update - Hotfix	2018-08-01 20:14:25 +01:00
views	Remove PHP4 constructors	2021-03-26 21:50:24 +00:00
AOS_Quotes.php	Remove PHP4 constructors	2021-03-26 21:50:24 +00:00
AOS_Quotes_sugar.php	Remove PHP4 constructors	2021-03-26 21:50:24 +00:00
controller.php	7.11.14	2020-06-10 10:42:30 +01:00
converToInvoice.php	Replace explicit bean instantiations in files 271 - 280	2020-01-22 13:51:18 +00:00
createContract.php	Replace explicit bean instantiations in files 271 - 280	2020-01-22 13:51:18 +00:00
createOpportunity.php	Replace explicit bean instantiations in files 271 - 280	2020-01-22 13:51:18 +00:00
Forms.php	initial commit	2013-09-23 20:30:44 +01:00
Menu.php	single_blank_line_at_eof	2018-07-19 11:38:09 +01:00
vardefs.php	Fix #8904 - Optimistic locking module definition incorrectly set on some modules	2020-10-26 21:58:38 +00:00