mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-11 03:04:09 +02:00
Code Issues Releases Wiki Activity

Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103

Browse Source 
Conflicts:
	phpBB/config/services.yml
This commit is contained in:
Nathan Guse
2012-09-14 16:01:37 -05:00
parent fb0ed78c8f f1fb555ea3
commit 0d7f49892a
15 changed files with 224 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/config/services.yml
View File

@@ -94,7 +94,7 @@ services:
arguments:
- @container
processor.config:
processor.ext:
class: phpbb_di_processor_ext
arguments:
- @ext.manager