Merge branch '3.1.x'

Conflicts:
	phpBB/includes/functions_messenger.php
This commit is contained in:
Marc Alexander 2015-09-07 12:16:12 +02:00
commit 3ddee852fa

View file

@ -931,6 +931,8 @@ class queue
{ {
// Do nothing // Do nothing
} }
$this->data = array();
} }
$lock->release(); $lock->release();