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. |
||
---|---|---|
.. | ||
admin.jsx | ||
application.js | ||
common.js | ||
error.js | ||
public-path.js | ||
public.jsx | ||
remote_interaction_helper.ts | ||
share.jsx | ||
sign_up.js |