mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-18 12:52:52 +00:00
1d6152f440
Conflicts: - config/locales/en.yml Conflict caused by the glitch-soc-specific “flavour” string being too close to the newly introduced “identity_proofs” string. Just included both. |
||
|---|---|---|
| .. | ||
| 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 | ||
| streamable.rb | ||
| user_roles.rb | ||