Tags: RafaelKr/sulu
Tags
Merge branch '2.5' of https://github.com/sulu/sulu into 2.6 Conflicts: phpstan-baseline.neon src/Sulu/Bundle/ContactBundle/Tests/Functional/Controller/AdminControllerTest.php src/Sulu/Bundle/ContactBundle/Tests/Functional/Controller/ContactControllerTest.php src/Sulu/Bundle/RouteBundle/Command/MovePageTreeCommand.php src/Sulu/Bundle/RouteBundle/Command/UpdateRouteCommand.php src/Sulu/Bundle/SecurityBundle/Tests/Functional/Controller/RoleControllerTest.php
Merge branch '2.5' of https://github.com/sulu/sulu into 2.6 Conflicts: src/Sulu/Bundle/CategoryBundle/Command/RecoverCommand.php
PreviousNext