hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-12 04:23:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '4.0'

Browse Source
This commit is contained in:
Benoît Burnichon
2016-03-16 17:21:57 +01:00
parent 73e55b43eb 817b72c0b0
commit 03b821acb7
29 changed files with 668 additions and 464 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Alchemy/Phrasea/Collection/Repository/ArrayCacheCollectionRepository.php
View File

@@ -21,7 +21,7 @@ class ArrayCacheCollectionRepository implements CollectionRepository
private $collectionRepository;
/**
* @var \collection[]
* @var \collection[]|null
*/
private $collectionCache = null;