0
0
Fork 0
mirror of https://github.com/salesagility/SuiteCRM.git synced 2025-02-05 06:29:44 +00:00
salesagility_SuiteCRM/modules/Connectors/connectors
Dillon-Brown 66954ac3af Merge remote-tracking branch 'upstream/hotfix-7.10.x' into hotfix
# Conflicts:
#	.travis.yml
#	README.md
#	data/SugarBean.php
#	include/MVC/View/SugarView.php
#	include/Smarty/plugins/function.fetch.php
#	include/SugarFields/Fields/File/SugarFieldFile.php
#	include/SugarObjects/templates/person/Person.php
#	include/SugarXHprof/SugarXHprof.php
#	include/SugarXHprof/xhprof_lib/utils/xhprof_runs.php
#	include/nusoap/class.nusoap_base.php
#	include/nusoap/class.soap_transport_http.php
#	include/nusoap/class.soapclient.php
#	include/nusoap/class.wsdl.php
#	include/nusoap/class.wsdlcache.php
#	include/parsecsv.lib.php
#	include/social/get_feed_data.php
#	include/tcpdf/barcodes.php
#	lib/Robo/Plugin/Commands/CodeCoverageCommands.php
#	modules/AOD_Index/Lib/Zend/Search/Lucene/Storage/File.php
#	modules/AOR_Charts/lib/pChart/class/pBarcode128.class.php
#	modules/AOR_Charts/lib/pChart/class/pBarcode39.class.php
#	modules/AOR_Charts/lib/pChart/class/pCache.class.php
#	modules/AOR_Charts/lib/pChart/class/pData.class.php
#	modules/AOR_Charts/lib/pChart/class/pDraw.class.php
#	modules/AOR_Charts/lib/pChart/class/pImage.class.php
#	modules/AOR_Charts/lib/pChart/class/pSpring.class.php
#	modules/AOS_PDF_Templates/templateParser.php
#	modules/AOS_Products/AOS_Products.php
#	modules/AOW_Actions/FormulaCalculator.php
#	modules/AOW_WorkFlow/aow_utils.php
#	modules/Trackers/store/DatabaseStore.php
#	phpcs.xml
#	service/core/REST/SugarRest.php
#	service/example/Rest_Proxy.php
#	suitecrm_version.php
#	tests/SuiteCRM/Test/SuitePHPUnit_Framework_TestCase.php
#	tests/unit/phpunit/data/SugarBeanTest.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.editTest.php
#	tests/unit/phpunit/include/utils/securityUtilsTest.php
#	tests/unit/phpunit/modules/ACLActions/ACLActionTest.php
#	tests/unit/phpunit/modules/Emails/EmailTest.php
#	tests/unit/phpunit/modules/ProspectLists/ProspectListTest.php
#	tests/unit/phpunit/modules/SchedulersJobs/SchedulersJobTest.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-09-20 14:53:13 +01:00
..
formatters/ext/rest/twitter/tpls Remove the deprecated linkedin code. 2015-08-24 15:18:44 +01:00
sources/ext/rest Merge remote-tracking branch 'upstream/hotfix-7.10.x' into hotfix 2019-09-20 14:53:13 +01:00