Conflicts: app/controllers/auth/confirmations_controller.rb |
||
|---|---|---|
| .. | ||
| confirmations_controller.rb | ||
| passwords_controller.rb | ||
| registrations_controller.rb | ||
| sessions_controller.rb | ||
Conflicts: app/controllers/auth/confirmations_controller.rb |
||
|---|---|---|
| .. | ||
| confirmations_controller.rb | ||
| passwords_controller.rb | ||
| registrations_controller.rb | ||
| sessions_controller.rb | ||