mirror of https://github.com/Siphonay/mastodon
ef3d15554b
Conflicts: - `Gemfile.lock`: Changes were already cherry-picked and updated further in glitch-soc. Kept glitch-soc's version. - `README.md`: Upstream updated its README, we have a completely different one. Kept glitch-soc's README. - `app/models/account.rb`: Not a real conflict, upstream updated some lines textually adjacent to glitch-soc-specific lines. Ported upstream's changes. |
||
|---|---|---|
| .. | ||
| account | ||
| status | ||
| user | ||
| attachmentable.rb | ||
| cacheable.rb | ||
| database_view_record.rb | ||
| domain_materializable.rb | ||
| domain_normalizable.rb | ||
| expireable.rb | ||
| follow_limitable.rb | ||
| lockable.rb | ||
| paginable.rb | ||
| rate_limitable.rb | ||
| redisable.rb | ||
| relationship_cacheable.rb | ||
| remotable.rb | ||