diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2012-10-29 15:16:59 -0400 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2012-10-29 15:16:59 -0400 |
| commit | c9ad0c6f25ddee3d433ec50b587c0a6668d4a174 (patch) | |
| tree | 54a96819d436a549ed3ea61dec4f6ab2669a2bb5 /phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php | |
| parent | dc8052b5c035f5eb588084e68ece7e0f977290a4 (diff) | |
| parent | 88b100d818940340e660c9f372526b1b5466bf3a (diff) | |
| download | forums-c9ad0c6f25ddee3d433ec50b587c0a6668d4a174.tar forums-c9ad0c6f25ddee3d433ec50b587c0a6668d4a174.tar.gz forums-c9ad0c6f25ddee3d433ec50b587c0a6668d4a174.tar.bz2 forums-c9ad0c6f25ddee3d433ec50b587c0a6668d4a174.tar.xz forums-c9ad0c6f25ddee3d433ec50b587c0a6668d4a174.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/11158] Require acl_u_sig for ucp signature module.
[ticket/11158] Revert old fix in PHPBB3-10186.
Conflicts:
phpBB/install/database_update.php
phpBB/ucp.php
Diffstat (limited to 'phpBB/includes/captcha/plugins/phpbb_captcha_gd_plugin.php')
0 files changed, 0 insertions, 0 deletions