aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/docs
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2011-12-01 22:21:57 +0100
committerNils Adermann <naderman@naderman.de>2011-12-01 22:21:57 +0100
commit5e225d5d7ab3890a6a06791742d1b2d97d9f40e1 (patch)
tree229bddb1b0662e4db8555045521d604d26100f6f /phpBB/docs
parentaf867de77c1e478a5294daabf6f482e19fa1a799 (diff)
parentcafe74a88de1adfc09ea23207ff1736a08b95cce (diff)
downloadforums-5e225d5d7ab3890a6a06791742d1b2d97d9f40e1.tar
forums-5e225d5d7ab3890a6a06791742d1b2d97d9f40e1.tar.gz
forums-5e225d5d7ab3890a6a06791742d1b2d97d9f40e1.tar.bz2
forums-5e225d5d7ab3890a6a06791742d1b2d97d9f40e1.tar.xz
forums-5e225d5d7ab3890a6a06791742d1b2d97d9f40e1.zip
Merge branch 'develop-olympus' into develop
* develop-olympus: [ticket/10480] Add a build target for changelog building. [ticket/10480] Add a build script for exporting the changelog from tracker. [ticket/10502] Fix typo in changelog. 'red' should have been 'read'.
Diffstat (limited to 'phpBB/docs')
-rw-r--r--phpBB/docs/CHANGELOG.html2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index c45ce38591..0c7ef18652 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -171,7 +171,7 @@
<h4>Improvement</h4>
<ul>
<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-8616">PHPBB3-8616</a>] - Add direct link to PM to notification message</li>
-<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-9036">PHPBB3-9036</a>] - Forums that can be listed but not red expose forum information</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-9036">PHPBB3-9036</a>] - Forums that can be listed but not read expose forum information</li>
<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-9297">PHPBB3-9297</a>] - Add support for Extended Passive Mode (EPSV) in class ftp_fsock to better support IPv6 connections.</li>
<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-9307">PHPBB3-9307</a>] - Mass email $max_chunk_size</li>
<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-9361">PHPBB3-9361</a>] - Edit account settings - Improved clarification needed</li>