Merge branch 'develop' into 'feat/notification-quick-filters'
# Conflicts: # CHANGELOG.md
No related branches found
No related tags found
Showing
- CHANGELOG.md 11 additions, 5 deletionsCHANGELOG.md
- package.json 0 additions, 1 deletionpackage.json
- src/components/chat_panel/chat_panel.js 12 additions, 0 deletionssrc/components/chat_panel/chat_panel.js
- src/components/chat_panel/chat_panel.vue 10 additions, 5 deletionssrc/components/chat_panel/chat_panel.vue
- src/components/user_card/user_card.vue 4 additions, 4 deletionssrc/components/user_card/user_card.vue
- src/i18n/en.json 6 additions, 0 deletionssrc/i18n/en.json
- src/main.js 0 additions, 2 deletionssrc/main.js
- src/modules/chat.js 1 addition, 0 deletionssrc/modules/chat.js
- yarn.lock 0 additions, 4 deletionsyarn.lock
Loading
Please register or sign in to comment