|
|
2272d3da66
|
Merge branch '2.6'
# Conflicts:
# src/Repository/EntryRepository.php
# src/Twig/WallabagExtension.php
# src/Wallabag/CoreBundle/Resources/views/Entry/_card_actions.html.twig
# src/Wallabag/CoreBundle/Resources/views/Entry/_card_list.html.twig
# tests/Twig/WallabagExtensionTest.php
|
2025-03-18 21:02:22 +01:00 |
|
