mirror of
https://github.com/glitch-soc/mastodon.git
synced 2024-11-25 09:34:16 -05:00
92fa9d34b0
Conflicts: - `app/controllers/authorize_interactions_controller.rb`: Small conflict due to our theming system. - `streaming/index.js`: Upstream refactored part of the streaming server. We had some extra logic for handling local-only posts. Applied the refactor. |
||
---|---|---|
.. | ||
activity | ||
adapter_spec.rb | ||
dereferencer_spec.rb | ||
linked_data_signature_spec.rb | ||
tag_manager_spec.rb |