aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2010-03-18 17:10:36 +0100
committerNils Adermann <naderman@naderman.de>2010-03-18 17:10:36 +0100
commit2c635b473bb06f07c643e120b5a6cbaaf9923e98 (patch)
treed4ff3708e6b2cbd7ceceab30b16bb0a7c247accd
parent49607a0b2c134355abe924fccc06df07a985edef (diff)
parent5193160546625b6378deda8c0028a861f0760292 (diff)
downloadforums-2c635b473bb06f07c643e120b5a6cbaaf9923e98.tar
forums-2c635b473bb06f07c643e120b5a6cbaaf9923e98.tar.gz
forums-2c635b473bb06f07c643e120b5a6cbaaf9923e98.tar.bz2
forums-2c635b473bb06f07c643e120b5a6cbaaf9923e98.tar.xz
forums-2c635b473bb06f07c643e120b5a6cbaaf9923e98.zip
Merge branch 'develop-olympus' into develop
* develop-olympus: [feature/arstechnica/memcache-multi-server] Add memcache-multi-server to the changelog.
-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 e5dcd82806..3f457efb69 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -105,6 +105,7 @@
<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>
+ <li>[Feature] The memcache acm plugin now supports multiple memcache servers.</li>
</ul>
<a name="v307"></a><h3>1.i. Changes since 3.0.7</h3>