Merge branch '2.1.x'

Conflicts:
	tests/unit/event/listener_test.php
This commit is contained in:
Marc Alexander committed 2015-06-24 16:10:22 +02:00
commit 0761948012
23 files changed
+830 -109

No files matched your search

-1
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');