diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-06-12 22:27:29 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-06-12 22:27:29 +0200 |
| commit | c6075003a30f3e361282fa67d394b03128cd5d7a (patch) | |
| tree | 41544faf59bb116db2707b77578083ee293c4b7a /phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php | |
| parent | ecc9a7dd9bd4224a71dd54a0ced2d1576bc4d74c (diff) | |
| parent | 939bb65b1708bd43c55ffc2d11ec36b938763f23 (diff) | |
| download | forums-c6075003a30f3e361282fa67d394b03128cd5d7a.tar forums-c6075003a30f3e361282fa67d394b03128cd5d7a.tar.gz forums-c6075003a30f3e361282fa67d394b03128cd5d7a.tar.bz2 forums-c6075003a30f3e361282fa67d394b03128cd5d7a.tar.xz forums-c6075003a30f3e361282fa67d394b03128cd5d7a.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[develop-olympus] Changelog: Changes since 3.0.8
[develop-olympus] Bumping version number for 3.0.9-RC1.
[develop-olympus] Bumping version number for 3.0.9-RC1 and 3.0.9 releases.
Conflicts:
phpBB/includes/constants.php
phpBB/install/convertors/convert_phpbb20.php
phpBB/install/database_update.php
phpBB/install/schemas/schema_data.sql
phpBB/styles/prosilver/imageset/imageset.cfg
phpBB/styles/prosilver/style.cfg
phpBB/styles/prosilver/template/template.cfg
phpBB/styles/prosilver/theme/theme.cfg
phpBB/styles/subsilver2/imageset/imageset.cfg
phpBB/styles/subsilver2/style.cfg
phpBB/styles/subsilver2/template/template.cfg
phpBB/styles/subsilver2/theme/theme.cfg
Diffstat (limited to 'phpBB/includes/captcha/plugins/phpbb_recaptcha_plugin.php')
0 files changed, 0 insertions, 0 deletions