Resolve a merged conflict - app/javascript/mastodon/features/compose/index.js
Resolve a merged conflict - app/javascript/mastodon/features/compose/index.js

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