Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

EZP-31691: Fixed password reset #73

Merged
merged 1 commit into from
Jun 22, 2020
Merged

EZP-31691: Fixed password reset #73

merged 1 commit into from
Jun 22, 2020

Conversation

mikadamczyk
Copy link
Contributor

@mikadamczyk mikadamczyk commented Jun 22, 2020

Question Answer
Tickets EZP-31691
Bug fix? yes
New feature? no
BC breaks? no
Tests pass? yes
Doc needed? no
License GPL-2.0

This PR fixes the password reset. During merge-up from branch 1.0 to 2.0 seems conflict was resolved incorrectly. Original PR to 1.0 https://github.com/ezsystems/ezplatform-user/pull/59/files and marge-up f692ef3.

Checklist:

  • Implement tests
  • Coding standards ($ composer fix-cs)

@mikadamczyk mikadamczyk added the Bug Something isn't working label Jun 22, 2020
@mikadamczyk mikadamczyk self-assigned this Jun 22, 2020
@lserwatka lserwatka merged commit efd2aea into 2.0 Jun 22, 2020
@lserwatka lserwatka deleted the EZP-31691-reset-password branch June 22, 2020 16:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Bug Something isn't working QA approved
4 participants