diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2012-09-14 16:01:37 -0500 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2012-09-14 16:01:37 -0500 |
| commit | 0d7f49892ae23a18a69b0cee0171e2dc1a8cb4a1 (patch) | |
| tree | ef324a2a89a88d814c58cc5904f3c35a86bcf56c /phpBB/config | |
| parent | fb0ed78c8fffe95d40e47c8dd27d44973eba88ae (diff) | |
| parent | f1fb555ea32fdd06dfdcae35c072e44b6c243126 (diff) | |
| download | forums-0d7f49892ae23a18a69b0cee0171e2dc1a8cb4a1.tar forums-0d7f49892ae23a18a69b0cee0171e2dc1a8cb4a1.tar.gz forums-0d7f49892ae23a18a69b0cee0171e2dc1a8cb4a1.tar.bz2 forums-0d7f49892ae23a18a69b0cee0171e2dc1a8cb4a1.tar.xz forums-0d7f49892ae23a18a69b0cee0171e2dc1a8cb4a1.zip | |
Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103
Conflicts:
phpBB/config/services.yml
Diffstat (limited to 'phpBB/config')
| -rw-r--r-- | phpBB/config/services.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/config/services.yml b/phpBB/config/services.yml index b9c697b481..d427820f89 100644 --- a/phpBB/config/services.yml +++ b/phpBB/config/services.yml @@ -94,7 +94,7 @@ services: arguments: - @container - processor.config: + processor.ext: class: phpbb_di_processor_ext arguments: - @ext.manager |