mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-20 07:21:30 +02:00
Code Issues Releases Wiki Activity

Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11912

Browse Source 
Conflicts:
	phpBB/config/services.yml
This commit is contained in:
Marc Alexander
2013-11-23 00:54:40 +01:00
parent e108418824 0d0b2627f7
commit 943ab555da
423 changed files with 5792 additions and 4880 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
phpBB/phpbb/plupload/plupload.php
View File

@@ -9,14 +9,6 @@
namespace phpbb\plupload;
/**
* @ignore
*/
if (!defined('IN_PHPBB'))
{
exit;
}
/**
* This class handles all server-side plupload functions
*