Merge branch '3.8'

Conflicts:
	lib/Alchemy/Phrasea/SearchEngine/SphinxSearch/SphinxSearchEngine.php
This commit is contained in:
Nicolas Le Goff
2014-02-05 15:25:52 +01:00
7 changed files with 13 additions and 24 deletions

View File

@@ -1061,12 +1061,4 @@ class SphinxSearchEngine implements SearchEngineInterface
{
return $this;
}
/**
* @inheritdoc
*/
public function clearAllCache(\DateTime $date = null)
{
return $this;
}
}