aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/docs
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2011-07-07 20:29:25 +0200
committerAndreas Fischer <bantu@phpbb.com>2011-07-07 20:29:25 +0200
commit9c6c5895bcb6c5d16c7014ae444d817795e20039 (patch)
treea1e0ee50e41e8d4cc09d58f0a70a5e8419aeccf5 /phpBB/docs
parent79af1da0a5f7ec4f7cca43913e5e42dddabd3251 (diff)
parentf2110183e0a362d4dc72019b97dc165c6fa858bd (diff)
downloadforums-9c6c5895bcb6c5d16c7014ae444d817795e20039.tar
forums-9c6c5895bcb6c5d16c7014ae444d817795e20039.tar.gz
forums-9c6c5895bcb6c5d16c7014ae444d817795e20039.tar.bz2
forums-9c6c5895bcb6c5d16c7014ae444d817795e20039.tar.xz
forums-9c6c5895bcb6c5d16c7014ae444d817795e20039.zip
Merge branch 'develop-olympus' into develop
* develop-olympus: [prep-release-3.0.9] Update Changelog for 3.0.9-RC4 release. [prep-release-3.0.9] Decreasing version for an RC4 release.
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