mirror of
https://github.com/lingble/chatwoot.git
synced 2025-11-08 06:53:26 +00:00
- Resolved conflicts in InboxName.vue (kept develop's ChannelIcon approach) - Resolved conflicts in ConversationCard.vue (merged both :conversation prop and flex classes) - Resolved conflicts in ContactInfo.vue (kept both inboxMixin and Avatar imports) - Resolved conflicts in en.yml (merged voice channel translations with reauthorization config)