Matt Lorimer 2c48735fbe Merge branch 'hotfix-7.10.x' into hotfix ... # Conflicts: # README.md # composer.lock # data/BeanFactory.php # files.md5 # modules/AOD_Index/AOD_Index.php # modules/AOR_Conditions/conditionLines.php # modules/AOW_Conditions/conditionLines.php # modules/Activities/SetAcceptStatus.php # modules/Administration/views/view.backups.php # modules/Calendar/controller.php # modules/Campaigns/WizardCampaignSave.php # modules/Contacts/AcceptDecline.php # modules/Emails/Compose.php # modules/Opportunities/OpportunityFormBase.php # modules/Project/chart.php # modules/SavedSearch/index.php # service/v3_1/SugarWebServiceUtilv3_1.php # soap/SoapPortalHelper.php # suitecrm_version.php # tests/unit/phpunit/data/SugarBeanTest.php # tests/unit/phpunit/include/SugarFolders/SugarFolderTest.php # tests/unit/phpunit/modules/AOS_Products/AOS_ProductsTest.php # themes/SuiteP/css/Dawn/style.css # themes/SuiteP/css/Day/style.css # themes/SuiteP/css/Dusk/style.css # themes/SuiteP/css/Night/style.css		2020-03-30 10:50:29 +01:00
..
Reminder_Invitee.php	Merge branch 'hotfix-7.10.x' into hotfix	2020-03-30 10:50:29 +01:00
vardefs.php	method_argument_space	2019-01-25 14:14:52 +00:00