Merge branch '4.10' into 4

This commit is contained in:
Steve Boyd 2022-03-08 16:06:08 +13:00
commit 59f23ad2aa

View File

@ -24,8 +24,7 @@ use Swift_RfcComplianceException;
class EmailTest extends SapphireTest class EmailTest extends SapphireTest
{ {
protected function setUp(): void
protected function setUp()
{ {
parent::setUp(); parent::setUp();
Director::config()->set('alternate_base_url', 'http://www.mysite.com/'); Director::config()->set('alternate_base_url', 'http://www.mysite.com/');