Merge branch '4.1' into 4.2

This commit is contained in:
Aaron Carlino 2019-01-10 14:49:25 +13:00
commit 9ccba1b0bb

View File

@ -29,7 +29,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()
{ {