GitBucket
|
fixed merge conflict
|
|---|
briley
authored
on 28 Jun 2017
|
| app/controllers/registrations_controller.rb |
|---|
| app/views/devise/registrations/_password_details.html.erb |
|---|
| app/views/plans/index.html.erb |
|---|