resolved cherry-pick conflicts
dev
1 parent a3d9ea6 commit 694991b419d0e334e5d298c00424e79624a8d5e1
@bhavi bhavi authored on 7 Jun 2017
Brian Riley committed on 9 Jun 2017
Showing 1 changed file
View
app/views/devise/registrations/edit.html.erb