aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/docs
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2011-07-07 20:29:14 +0200
committerAndreas Fischer <bantu@phpbb.com>2011-07-07 20:29:14 +0200
commitf2110183e0a362d4dc72019b97dc165c6fa858bd (patch)
tree1683d0baf7ece03fe08ea2889c4d285e12bd24a8 /phpBB/docs
parent71df03960ca55a19aca2ea24517030b6dc2dcaf6 (diff)
parent1fa77c2fd5f6a17dc2b99d15063e0a9d9f689211 (diff)
downloadforums-f2110183e0a362d4dc72019b97dc165c6fa858bd.tar
forums-f2110183e0a362d4dc72019b97dc165c6fa858bd.tar.gz
forums-f2110183e0a362d4dc72019b97dc165c6fa858bd.tar.bz2
forums-f2110183e0a362d4dc72019b97dc165c6fa858bd.tar.xz
forums-f2110183e0a362d4dc72019b97dc165c6fa858bd.zip
Merge branch 'prep-release-3.0.9' into develop-olympus
* prep-release-3.0.9: [prep-release-3.0.9] Update Changelog for 3.0.9-RC4 release. [prep-release-3.0.9] Decreasing version for an RC4 release. Conflicts: phpBB/includes/constants.php phpBB/install/database_update.php phpBB/install/schemas/schema_data.sql
Diffstat (limited to 'phpBB/docs')
-rw-r--r--phpBB/docs/CHANGELOG.html2
1 files changed, 2 insertions, 0 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index c0ec93cafb..6437fef1d5 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -335,6 +335,8 @@
</li>
<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10247'>PHPBB3-10247</a>] - mediumint(8) too small for phpbb_login_attempts.attempt_id
</li>
+<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-10250'>PHPBB3-10250</a>] - phpBB Logo needs the Registered Trademark Symbol
+</li>
</ul>
<h4> Improvement