Conflicts: - `README.md`: Discarded upstream changes: we have our own README - `app/controllers/follower_accounts_controller.rb`: Port upstream's minor refactoring |
||
|---|---|---|
| .. | ||
| challenges | ||
| confirmations | ||
| passwords | ||
| registrations | ||
| sessions | ||
| setup | ||
| shared | ||
Conflicts: - `README.md`: Discarded upstream changes: we have our own README - `app/controllers/follower_accounts_controller.rb`: Port upstream's minor refactoring |
||
|---|---|---|
| .. | ||
| challenges | ||
| confirmations | ||
| passwords | ||
| registrations | ||
| sessions | ||
| setup | ||
| shared | ||