aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2014-10-25 18:11:09 -0700
committerNils Adermann <naderman@naderman.de>2014-10-25 18:11:09 -0700
commitd70d2cfcd1c51fc47e42c6a812f6f1222911fb97 (patch)
tree88a435cc657f1d99c091a30ab8d50e78a36eca81
parentcfe1a7d6d131d1a73d7c7a5ba1a045781045d47c (diff)
parenta5830fe0d56cfb354e1ec0a544847802253b33fb (diff)
downloadforums-d70d2cfcd1c51fc47e42c6a812f6f1222911fb97.tar
forums-d70d2cfcd1c51fc47e42c6a812f6f1222911fb97.tar.gz
forums-d70d2cfcd1c51fc47e42c6a812f6f1222911fb97.tar.bz2
forums-d70d2cfcd1c51fc47e42c6a812f6f1222911fb97.tar.xz
forums-d70d2cfcd1c51fc47e42c6a812f6f1222911fb97.zip
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus: [prep-release-3.1.0] Add missing CHANGELOG entries for RC6
-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 22fbf9a79c..ebc0d34fa6 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -142,6 +142,8 @@
<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13190">PHPBB3-13190</a>] - phpbb_session_login_keys_test::test_reset_keys fails on develop-ascraeus</li>
<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13194">PHPBB3-13194</a>] - BBCode isn't parsed when issuing a warning for a post</li>
<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13203">PHPBB3-13203</a>] - Use constant time comparison method for comparing password hashes</li>
+ <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13217">PHPBB3-13217</a>] - Remember me cookie leak</li>
+ <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13218">PHPBB3-13218</a>] - Missing token check in acp_styles</li>
</ul>
<h4>Improvement</h4>
<ul>