aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/docs
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2010-03-17 18:05:17 +0100
committerNils Adermann <naderman@naderman.de>2010-03-17 18:05:17 +0100
commit10f81ee79fe20baae7eb0dcced0d7a48110c3f8b (patch)
treee46d53f88e71ea03a7eae954d25ac0c7b26ba57d /phpBB/docs
parent60bd1edcb5e5992e6e693d0f68db47e678f7d54a (diff)
parent144effd74cf52a71a62e127276d78f56eab41835 (diff)
downloadforums-10f81ee79fe20baae7eb0dcced0d7a48110c3f8b.tar
forums-10f81ee79fe20baae7eb0dcced0d7a48110c3f8b.tar.gz
forums-10f81ee79fe20baae7eb0dcced0d7a48110c3f8b.tar.bz2
forums-10f81ee79fe20baae7eb0dcced0d7a48110c3f8b.tar.xz
forums-10f81ee79fe20baae7eb0dcced0d7a48110c3f8b.zip
Merge branch 'bug/jellydoughnut/58415' into develop-olympus
* bug/jellydoughnut/58415: Allow setting parent forums regardless of permission settings. (Bug #58415) Conflicts: phpBB/docs/CHANGELOG.html
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 7b8d8f63f2..e5dcd82806 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -103,6 +103,7 @@
<li>[Fix] Allow multibyte keys in request_var(). (Bug #51555)</li>
<li>[Fix] Prevent wrong tar archive type detection. (Bug #12531)</li>
<li>[Fix] Correct redirection after login to forum not in web root (Bug #58755)</li>
+ <li>[Fix] Allow setting parent forums regardless of permission settings. (Bug #57415)</li>
<li>[Feature] Support for Microsoft's Native SQL Server Driver for PHP (Bug #57055 - Patch by Chris Pucci at Microsoft)</li>
</ul>