Merge branch 'ticket/669' into ticket/669-master

Conflicts:
	tests/functional/portal_announcement_test.php
This commit is contained in:
Marc Alexander committed 2016-01-07 11:54:34 +01:00
commit 306101fee9
3 files changed
+5

No files matched your search

@@ -15,6 +15,7 @@ class phpbb_functional_portal_announcement_test extends \board3\portal\tests\tes
public function setUp()
{
parent::setUp();
$this->purge_cache();
$this->login();
$this->admin_login();