0
0
Fork 0
mirror of https://github.com/salesagility/SuiteCRM.git synced 2025-02-05 06:29:44 +00:00
salesagility_SuiteCRM/modules/Leads/views
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
..
view.convertlead.php Merge branch 'hotfix-7.10.x' into hotfix 2020-03-30 10:50:29 +01:00
view.detail.php FIX #7189 - Remove redundant require_once 2019-04-15 16:51:14 -03:00
view.edit.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
view.list.php FIX #7189 - Remove redundant require_once 2019-04-15 16:51:14 -03:00
view.showduplicates.php Replace explicit bean instantiations in files 311 - 320 2020-01-22 13:51:23 +00:00