9f92b05bd2
Conflicts: - `README.md`: Upstream has updated their README but we have a completely different one. Kept our version of `README.md` |
||
|---|---|---|
| .. | ||
| challenges_controller.rb | ||
| confirmations_controller.rb | ||
| omniauth_callbacks_controller.rb | ||
| passwords_controller.rb | ||
| registrations_controller.rb | ||
| sessions_controller.rb | ||
| setup_controller.rb | ||