diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2014-11-18 15:11:14 +0100 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2014-11-18 15:11:14 +0100 |
| commit | 4bfd5e0d9a8fc0a1db9c1b818631401b96feaae0 (patch) | |
| tree | 55102b3aeac13e7ee917ea845421d1717730e7e7 /phpBB/phpbb/di | |
| parent | 1e03dddcfe35d7174e69a8b350c63bc94dc1209e (diff) | |
| parent | 0019039bc105db52dbd3727a038b86797a15747c (diff) | |
| download | forums-4bfd5e0d9a8fc0a1db9c1b818631401b96feaae0.tar forums-4bfd5e0d9a8fc0a1db9c1b818631401b96feaae0.tar.gz forums-4bfd5e0d9a8fc0a1db9c1b818631401b96feaae0.tar.bz2 forums-4bfd5e0d9a8fc0a1db9c1b818631401b96feaae0.tar.xz forums-4bfd5e0d9a8fc0a1db9c1b818631401b96feaae0.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[ticket/13315] Check for the includes/captcha/plugins/ directory instead.
[ticket/13315] Fix loss of CAPTCHA plugin config value.
Diffstat (limited to 'phpBB/phpbb/di')
0 files changed, 0 insertions, 0 deletions