diff options
| author | Nils Adermann <naderman@naderman.de> | 2014-10-26 12:54:02 -0700 | 
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2014-10-26 12:54:02 -0700 | 
| commit | 222bec0204fa600bd72df3bba8fc45131af41c83 (patch) | |
| tree | f433ceaeedd4930d988486429d46ffafb91e68c4 | |
| parent | 78aa120089bb1b82d9d6b2124dc36ec498e3924b (diff) | |
| parent | 51251293abb40e04e290df2f937504cfaabde43b (diff) | |
| download | forums-222bec0204fa600bd72df3bba8fc45131af41c83.tar forums-222bec0204fa600bd72df3bba8fc45131af41c83.tar.gz forums-222bec0204fa600bd72df3bba8fc45131af41c83.tar.bz2 forums-222bec0204fa600bd72df3bba8fc45131af41c83.tar.xz forums-222bec0204fa600bd72df3bba8fc45131af41c83.zip  | |
Merge branch 'prep-release-3.1.0' into develop-ascraeus
* prep-release-3.1.0:
  [prep-release-3.1.0] Update CHANGELOG with last minute changes
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 2 | 
1 files changed, 2 insertions, 0 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index ebc0d34fa6..225de3ca33 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -144,6 +144,8 @@  		<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> +		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13221">PHPBB3-13221</a>] - Can't upgrade to 3.1 from 3.0.11 and older</li> +		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13223">PHPBB3-13223</a>] - Using get_username_string() for email template variables causes HTML markup in emails</li>  	</ul>  	<h4>Improvement</h4>  	<ul>  | 
