diff options
author | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-02-26 15:32:27 -0600 |
---|---|---|
committer | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-02-26 15:32:27 -0600 |
commit | a01da0c1ee83d15e4c466a80db78fd7e9859e637 (patch) | |
tree | 651cd313ae0d225d67fb0a4f1755d7f87b2546b7 /phpBB/config | |
parent | d2295b3d1f191710916b12980e13c97419ecf0ae (diff) | |
parent | 80bd78a5e5e1069773c05073cd47662a311bda79 (diff) | |
download | forums-a01da0c1ee83d15e4c466a80db78fd7e9859e637.tar forums-a01da0c1ee83d15e4c466a80db78fd7e9859e637.tar.gz forums-a01da0c1ee83d15e4c466a80db78fd7e9859e637.tar.bz2 forums-a01da0c1ee83d15e4c466a80db78fd7e9859e637.tar.xz forums-a01da0c1ee83d15e4c466a80db78fd7e9859e637.zip |
Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103
Conflicts:
phpBB/install/database_update.php
Diffstat (limited to 'phpBB/config')
-rw-r--r-- | phpBB/config/services.yml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/phpBB/config/services.yml b/phpBB/config/services.yml index 40358259d8..3e4ae8d129 100644 --- a/phpBB/config/services.yml +++ b/phpBB/config/services.yml @@ -113,8 +113,10 @@ services: ext.manager: class: phpbb_extension_manager arguments: + - @service_container - @dbal.conn - @config + - @migrator - %tables.ext% - %core.root_path% - .%core.php_ext% |