aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/docs
diff options
context:
space:
mode:
authorDavid M <davidmj@users.sourceforge.net>2007-09-06 03:55:29 +0000
committerDavid M <davidmj@users.sourceforge.net>2007-09-06 03:55:29 +0000
commita74fe8a8113f9b20fa8bb16b16d07592d54b7186 (patch)
treeedc4d4c999ae3322979b9c200fca62e521aad2f5 /phpBB/docs
parent3af602fca429db22bb69f2254fb195e2b248a5b8 (diff)
downloadforums-a74fe8a8113f9b20fa8bb16b16d07592d54b7186.tar
forums-a74fe8a8113f9b20fa8bb16b16d07592d54b7186.tar.gz
forums-a74fe8a8113f9b20fa8bb16b16d07592d54b7186.tar.bz2
forums-a74fe8a8113f9b20fa8bb16b16d07592d54b7186.tar.xz
forums-a74fe8a8113f9b20fa8bb16b16d07592d54b7186.zip
#14363
git-svn-id: file:///svn/phpbb/trunk@8082 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/docs')
-rw-r--r--phpBB/docs/CHANGELOG.html1
1 files changed, 1 insertions, 0 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index 84a8946e06..63bf32773f 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -201,6 +201,7 @@ p a {
<li>[Change] Moved note about dns_get_record function for using GTalk (Jabber) from Jabber log to Jabber ACP panel</li>
<li>[Fix] Do not use register_shutdown_function within cron.php if handling the queue and the mail function being used (Bug #14321)</li>
<li>[Fix] Fixing private message on-hold code if moving messages into folder based on rules (Bug #14309)</li>
+ <li>[Fix] Allow the merge selection screen to work (Bug #14363)</li>
</ul>
</div>