Resolve a merged conflict - app/javascript/mastodon/components/status.js
Resolve a merged conflict - app/javascript/mastodon/components/status.js

pixiv/mastodon,pixiv/mastodon,pixiv/mastodon,pixiv/mastodon