mirror of
https://github.com/silverstripe/silverstripe-cms
synced 2024-10-22 08:05:56 +02:00
Merge branch '4.1' into 4.2
This commit is contained in:
commit
9ccba1b0bb
@ -29,7 +29,7 @@ class CMSMainTest extends FunctionalTest
|
||||
{
|
||||
protected static $fixture_file = 'CMSMainTest.yml';
|
||||
|
||||
static protected $orig = array();
|
||||
protected static $orig = array();
|
||||
|
||||
public function setUp()
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user