0
0
Fork 0
mirror of https://github.com/salesagility/SuiteCRM.git synced 2025-02-05 06:29:44 +00:00
salesagility_SuiteCRM/service/v2_1
Dillon-Brown af4b1e71f5 Merge remote-tracking branch 'upstream/hotfix-7.10.x' into fix/merge_statechecker
# Conflicts:
#	README.md
#	composer.json
#	composer.lock
#	files.md5
#	include/StateChecker.php
#	include/utils.php
#	modules/ACLRoles/DetailView.php
#	modules/AOS_Products_Quotes/Line_Items.php
#	modules/Administration/ElasticSearchSettings.php
#	modules/Currencies/Currency.php
#	service/core/webservice.php
#	suitecrm_version.php
#	tests/SuiteCRM/Test/SuitePHPUnitFrameworkTestCase.php
#	tests/unit/phpunit/SuitePHPUnit_Framework_TestCase.php
#	tests/unit/phpunit/data/SugarBeanTest.php
#	tests/unit/phpunit/include/APIErrorObjectTest.php
#	tests/unit/phpunit/include/ErrorMessageTest.php
#	tests/unit/phpunit/include/Imap/ImapHandlerFactoryTest.php
#	tests/unit/phpunit/include/MVC/Controller/SugarControllerTest.php
#	tests/unit/phpunit/include/MVC/SugarApplicationTest.php
#	tests/unit/phpunit/include/MVC/View/SugarViewTest.php
#	tests/unit/phpunit/include/MVC/View/views/view.classicTest.php
#	tests/unit/phpunit/include/MVC/View/views/view.detailTest.php
#	tests/unit/phpunit/include/MVC/View/views/view.editTest.php
#	tests/unit/phpunit/include/MVC/View/views/view.importvcardsaveTest.php
#	tests/unit/phpunit/include/MVC/View/views/view.jsonTest.php
#	tests/unit/phpunit/include/SugarEmailAddress/SugarEmailAddressTest.php
#	tests/unit/phpunit/include/SugarFolders/SugarFolderTest.php
#	tests/unit/phpunit/include/utils/LogicHookTest.php
#	tests/unit/phpunit/include/utils/phpZipUtilsTest.php
#	tests/unit/phpunit/include/utils/securityUtilsTest.php
#	tests/unit/phpunit/lib/SuiteCRM/Utility/SuiteLoggerTest.php
#	tests/unit/phpunit/modules/ACLActions/ACLActionTest.php
#	tests/unit/phpunit/modules/AOW_WorkFlow/AOW_WorkFlowTest.php
#	tests/unit/phpunit/modules/Emails/EmailTest.php
#	tests/unit/phpunit/modules/FP_events/FP_eventsTest.php
#	tests/unit/phpunit/modules/ProspectLists/ProspectListTest.php
#	tests/unit/phpunit/modules/SchedulersJobs/SchedulersJobTest.php
#	tests/unit/phpunit/modules/Tasks/TaskTest.php
#	tests/unit/phpunit/modules/UserPreferences/UserPreferenceTest.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
2019-11-19 14:32:37 +00:00
..
registry.php PSR-2 2019-07-04 17:06:34 +01:00
rest.php Copyright notice update - Hotfix 2018-08-01 20:14:25 +01:00
soap.php Merge branch 'hotfix' of https://github.com/salesagility/SuiteCRM into develop_merge_hotfix 2018-10-30 18:04:30 +00:00
SugarWebServiceImplv2_1.php Fix typos and improve grammar 2019-10-29 00:59:35 +05:30