mirror of
https://github.com/mastodon/mastodon.git
synced 2024-11-30 16:41:55 +00:00
33d30632fb
Conflicts: - `app/models/public_feed.rb`: Upstream refactored a bit, glitch-soc had specific code for local-only statuses. Updated glitch-soc's specific code accordingly. |
||
---|---|---|
.. | ||
activitypub | ||
account_relationships_presenter.rb | ||
initial_state_presenter.rb | ||
instance_presenter.rb | ||
status_relationships_presenter.rb |