mirror of
https://github.com/funamitech/mastodon
synced 2024-12-14 22:59:46 +09: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. |
||
---|---|---|
.. | ||
components | ||
containers | ||
util | ||
index.jsx |