aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/cache/driver/xcache.php
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2012-12-09 21:02:31 +0100
committerMarc Alexander <admin@m-a-styles.de>2012-12-09 21:02:31 +0100
commit1aae72961a3205a8487218b6d69361c43a1297d6 (patch)
tree3096a599c14c88084f782022f002ed84224ccf8b /phpBB/includes/cache/driver/xcache.php
parent26bde05a30c7111b57621a37d86425aa69d74263 (diff)
parent3fe381eed561e724700b21789e28ea3efb1f7ef9 (diff)
downloadforums-1aae72961a3205a8487218b6d69361c43a1297d6.tar
forums-1aae72961a3205a8487218b6d69361c43a1297d6.tar.gz
forums-1aae72961a3205a8487218b6d69361c43a1297d6.tar.bz2
forums-1aae72961a3205a8487218b6d69361c43a1297d6.tar.xz
forums-1aae72961a3205a8487218b6d69361c43a1297d6.zip
Merge branch 'develop' into feature/avatars
Conflicts: phpBB/install/database_update.php
Diffstat (limited to 'phpBB/includes/cache/driver/xcache.php')
-rw-r--r--phpBB/includes/cache/driver/xcache.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/cache/driver/xcache.php b/phpBB/includes/cache/driver/xcache.php
index 0b768bdb3e..06c5fafd97 100644
--- a/phpBB/includes/cache/driver/xcache.php
+++ b/phpBB/includes/cache/driver/xcache.php
@@ -41,7 +41,7 @@ class phpbb_cache_driver_xcache extends phpbb_cache_driver_memory
/**
* Purge cache data
*
- * @return void
+ * @return null
*/
function purge()
{