Skip to content

Commit 0b0bde4

Browse files
author
Piotr Tułacz
committed
Merge remote-tracking branch 'origin/SYL-5046/SKYNET' into SYL-5046/SKYNET
# Conflicts: # src/Sylius/Bundle/ShopBundle/templates/shared/layout/base/header/content/security/logged_in_user/desktop/logout.html.twig # src/Sylius/Bundle/ShopBundle/templates/shared/layout/base/header/content/security/logged_in_user/desktop/my_account.html.twig # src/Sylius/Bundle/ShopBundle/templates/shared/layout/base/header/content/security/visitor/desktop/register.html.twig
2 parents b84c320 + ccecc71 commit 0b0bde4

0 file changed

File tree

    0 commit comments

    Comments
     (0)