devol/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2025-01-31 15:55:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6468 from wallabag/fix/test-2.5-merge

Browse Source 
Fix test following 2.5 merge into master
This commit is contained in:
Jérémy Benoist 2023-04-24 15:20:05 +02:00 committed by GitHub
commit 81eebb46fd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 262 additions and 406 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Wallabag/AnnotationBundle/Repository/AnnotationRepository.php
View File

@ -90,7 +90,7 @@ class AnnotationRepository extends ServiceEntityRepository
*
* @param int $entryId
*
* @return array
* @return Annotation|null
*/
public function findLastAnnotationByUserId($entryId, $userId)
{

2
web/wallassets/material.css
View File

File diff suppressed because one or more lines are too long

2
web/wallassets/material.css.map
View File

File diff suppressed because one or more lines are too long

652
yarn.lock
View File

File diff suppressed because it is too large Load Diff