Merge branch '2.1.x'
Conflicts: tests/unit/event/listener_test.php
This commit is contained in:
commit
0761948012
23 files changed
+830
-109
No files matched your search
@@ -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');
|
||||
|
||||
Reference in new issue
Block a user