Skip to content
Blame Permalink
  • attilak's avatar
    8cf53d82
    Merge branch 'develop' into generic-component · 8cf53d82
    attilak authored 
    # Conflicts:
#	Block/Redirect/Redirect.php
#	Controller/Process/Redirect.php
#	Gateway/Validator/CheckoutResponseValidator.php
#	view/frontend/layout/adyen_process_redirect.xml
#	view/frontend/templates/redirect/redirect.phtml
    8cf53d82
    Merge branch 'develop' into generic-component
    attilak authored 
    # Conflicts:
#	Block/Redirect/Redirect.php
#	Controller/Process/Redirect.php
#	Gateway/Validator/CheckoutResponseValidator.php
#	view/frontend/layout/adyen_process_redirect.xml
#	view/frontend/templates/redirect/redirect.phtml