diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2013-09-12 12:45:17 -0500 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2013-09-12 12:45:17 -0500 |
| commit | baa73f6933e70f79482e0c4c978d3bfa53eed768 (patch) | |
| tree | a5d2c64c7d84554e9cf5c62278917ece6629f0db /phpBB/config | |
| parent | 934786d45da83ec85f5d45794eef8a6221803259 (diff) | |
| parent | 310844fb7d0330d4329bd59c3d6d50d01caaa4d4 (diff) | |
| download | forums-baa73f6933e70f79482e0c4c978d3bfa53eed768.tar forums-baa73f6933e70f79482e0c4c978d3bfa53eed768.tar.gz forums-baa73f6933e70f79482e0c4c978d3bfa53eed768.tar.bz2 forums-baa73f6933e70f79482e0c4c978d3bfa53eed768.tar.xz forums-baa73f6933e70f79482e0c4c978d3bfa53eed768.zip | |
Merge remote-tracking branch 'remotes/imkingdavid/ticket/11824' into ticket/11832
* remotes/imkingdavid/ticket/11824:
[ticket/11824] Revert changes in functions.php
[ticket/11824] Reorganize test file
[ticket/11824] Update language string for board settings
[ticket/11824] Revert changes to functions_content.php
[ticket/11824] Add tests for urls with mod_rewrite enabled
[ticket/11824] Correct a comment
[ticket/11824] Change copyright year in migration file
[ticket/11824] Remove unused globals
[ticket/11824] Fix smilies
[ticket/11824] Fix logic
[ticket/11824] Add option for mod_rewrite
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 01e470f87f..e6a76ce88e 100644 --- a/phpBB/config/services.yml +++ b/phpBB/config/services.yml @@ -90,7 +90,7 @@ services: arguments: - @template - @user - - @request + - @config - %core.root_path% - %core.php_ext% |