mirror of
https://github.com/mastodon/mastodon.git
synced 2024-11-28 16:07:51 +00:00
444796b69b
Conflicts: - app/controllers/application_controller.rb - app/controllers/auth/confirmations_controller.rb - app/controllers/auth/sessions_controller.rb - app/controllers/settings/deletes_controller.rb - app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb |
||
|---|---|---|
| .. | ||
| account_associations.rb | ||
| account_avatar.rb | ||
| account_counters.rb | ||
| account_finder_concern.rb | ||
| account_header.rb | ||
| account_interactions.rb | ||
| attachmentable.rb | ||
| cacheable.rb | ||
| domain_normalizable.rb | ||
| expireable.rb | ||
| ldap_authenticable.rb | ||
| omniauthable.rb | ||
| paginable.rb | ||
| pam_authenticable.rb | ||
| redisable.rb | ||
| relationship_cacheable.rb | ||
| remotable.rb | ||
| status_threading_concern.rb | ||
| user_roles.rb | ||