mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-18 04:43:24 +00:00
60abcb3c4c
Conflicts: - `config/i18n-tasks.yml`: Upstream added new ignored strings, glitch-soc has extra ignored strings because of the theming system. Added upstream's changes. |
||
|---|---|---|
| .. | ||
| account_associations.rb | ||
| account_avatar.rb | ||
| account_counters.rb | ||
| account_finder_concern.rb | ||
| account_header.rb | ||
| account_interactions.rb | ||
| account_merging.rb | ||
| attachmentable.rb | ||
| cacheable.rb | ||
| domain_materializable.rb | ||
| domain_normalizable.rb | ||
| expireable.rb | ||
| follow_limitable.rb | ||
| ldap_authenticable.rb | ||
| lockable.rb | ||
| omniauthable.rb | ||
| paginable.rb | ||
| pam_authenticable.rb | ||
| rate_limitable.rb | ||
| redisable.rb | ||
| relationship_cacheable.rb | ||
| remotable.rb | ||
| status_snapshot_concern.rb | ||
| status_threading_concern.rb | ||