Merge branch '4.3' into 4

This commit is contained in:
Aaron Carlino 2019-01-10 14:57:01 +13:00
commit 75f41b56d5

View File

@ -30,7 +30,7 @@ class CMSMainTest extends FunctionalTest
{ {
protected static $fixture_file = 'CMSMainTest.yml'; protected static $fixture_file = 'CMSMainTest.yml';
static protected $orig = array(); protected static $orig = array();
public function setUp() public function setUp()
{ {