Julian/phpbb_board3-portal_tlw
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '2.1.x'

Browse Source 
Conflicts:
	tests/unit/event/listener_test.php
This commit is contained in:
Marc Alexander
2015-06-24 16:06:50 +02:00
parent cba13d7a7d 281aa4fcc7
commit 0761948012
23 changed files with 830 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tests/unit/functions/fetch_news_test.php
View File

@@ -7,7 +7,6 @@
*
*/
require_once(dirname(__FILE__) . '/../../../includes/functions.php');
require_once(dirname(__FILE__) . '/../../../../../../includes/functions_acp.php');
require_once(dirname(__FILE__) . '/../../../../../../includes/functions.php');
require_once(dirname(__FILE__) . '/../../../../../../includes/utf/utf_tools.php');