mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-09 08:25:55 +00:00
040b7d37a4
Conflicts: - `app/services/remove_status_service.rb`: Conflict due to glitch-soc having extra code for a proper direct visibility timeline, in a part of the code upstream refactored. Restored glitch-soc's extra code in the refactored bit. |
||
---|---|---|
.. | ||
activity | ||
parser | ||
activity.rb | ||
adapter.rb | ||
case_transform.rb | ||
dereferencer.rb | ||
forwarder.rb | ||
linked_data_signature.rb | ||
serializer.rb | ||
tag_manager.rb |