Skip to content
Snippets Groups Projects
Commit a874db67 authored by Ji Lu's avatar Ji Lu
Browse files

Merge remote-tracking branch 'origin/MAGETWO-58261-customer-change-password' into pr 

# Conflicts:
#	dev/tests/functional/tests/app/Magento/Customer/Test/Block/Form/CustomerForm.php
#	dev/tests/functional/tests/app/Magento/Security/Test/TestCase/SecureChangingCustomerPasswordTest.php
parents 53e8d6b7 9deecb8d
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment