mirror of
https://github.com/wallabag/wallabag.git
synced 2025-06-27 16:36:00 +00:00
Merge remote-tracking branch 'origin/2.6' into port/2.6.10
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
This commit is contained in:
commit
1d661e8c68
46 changed files with 1306 additions and 375 deletions
|
@ -602,7 +602,7 @@ class EntryController extends AbstractController
|
|||
*
|
||||
* @param int $page
|
||||
*
|
||||
* @Route("/domain/{id}/{page}", requirements={"id" = ".+"}, defaults={"page" = 1}, name="same_domain")
|
||||
* @Route("/domain/{id}/{page}", requirements={"id" = "\d+"}, defaults={"page" = 1}, name="same_domain")
|
||||
* @IsGranted("LIST_ENTRIES")
|
||||
*
|
||||
* @return Response
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue