Merge branch '3.1.x' into 3.2.x

This commit is contained in:
Marc Alexander 2017-04-16 15:14:04 +02:00
commit 1b63292cc3
No known key found for this signature in database
GPG key ID: 50E0D2423696F995

View file

@ -20,5 +20,7 @@ class phpbb_mock_extension_manager extends \phpbb\extension\manager
$this->extensions = $extensions;
$this->filesystem = new \phpbb\filesystem\filesystem();
$this->container = $container;
$this->config = new \phpbb\config\config(array());
$this->user = new \phpbb\user('\phpbb\datetime');
}
}