mirror of
https://github.com/silverstripe/silverstripe-cms
synced 2024-06-28 15:39:42 +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';
|
protected static $fixture_file = 'CMSMainTest.yml';
|
||||||
|
|
||||||
static protected $orig = array();
|
protected static $orig = array();
|
||||||
|
|
||||||
public function setUp()
|
public function setUp()
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue
Block a user