diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2015-06-14 17:40:18 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2015-06-14 17:40:18 +0200 |
| commit | 2a662c5e07cdf14410bdc3cc48250443dfdeb269 (patch) | |
| tree | 56a5ce0b804d8a2428e91e77b083fa7afb2b1a33 /phpBB/docs | |
| parent | 2eceaaddf68d0d1f1dca741d49386e889cf1cc4e (diff) | |
| parent | 7ccb19fa001cb0f76499fd19256e60df382c6d2a (diff) | |
| download | forums-2a662c5e07cdf14410bdc3cc48250443dfdeb269.tar forums-2a662c5e07cdf14410bdc3cc48250443dfdeb269.tar.gz forums-2a662c5e07cdf14410bdc3cc48250443dfdeb269.tar.bz2 forums-2a662c5e07cdf14410bdc3cc48250443dfdeb269.tar.xz forums-2a662c5e07cdf14410bdc3cc48250443dfdeb269.zip | |
Merge branch '3.1.x'
Conflicts:
build/build.xml
phpBB/phpbb/user.php
Diffstat (limited to 'phpBB/docs')
| -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 e5aeb34144..c9b292ab6d 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -146,6 +146,8 @@ <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13913">PHPBB3-13913</a>] - Post subject of password protected and list-only forums shown on board index</li> <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13922">PHPBB3-13922</a>] - Whitespace found at end of line phpBB/includes/functions_admin.php</li> <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13928">PHPBB3-13928</a>] - Fix build_cfg_template_test after ticket/sec-184 </li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13939">PHPBB3-13939</a>] - phpBB no longer shows error messages when uploading files with drag/drop</li> + <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13942">PHPBB3-13942</a>] - phpbb\user::set_lang() adds extra path and PHP extension to ext lang files</li> </ul> <h4>Improvement</h4> <ul> |