Closed Nalipp closed 5 years ago
Master branch and the r12-password-reset branch has multiple merge conflicts.
r12-password-reset has already been merged but the functionality of the password reset is incomplete.
The best option from here might be to try reimplementing the password reset on a new branch.
The new branch will need to have frequent commits so that we can make sure that it continues to work with Travis.
Master branch and the r12-password-reset branch has multiple merge conflicts.
r12-password-reset has already been merged but the functionality of the password reset is incomplete.
The best option from here might be to try reimplementing the password reset on a new branch.
The new branch will need to have frequent commits so that we can make sure that it continues to work with Travis.