mirror of
https://github.com/mastodon/mastodon.git
synced 2024-12-17 15:35:10 +00:00
8142bd2553
Conflicts:
app/models/status.rb
The conflict in the Status model was due to
|
||
---|---|---|
.. | ||
account_avatar.rb | ||
account_finder_concern.rb | ||
account_header.rb | ||
account_interactions.rb | ||
attachmentable.rb | ||
cacheable.rb | ||
omniauthable.rb | ||
paginable.rb | ||
relationship_cacheable.rb | ||
remotable.rb | ||
status_threading_concern.rb | ||
streamable.rb |