Merge branch 'develop' into 'feat/timeline-quick-settings'
# Conflicts: # CHANGELOG.md
No related branches found
No related tags found
Showing
- CHANGELOG.md 5 additions, 0 deletionsCHANGELOG.md
- package.json 1 addition, 1 deletionpackage.json
- src/components/basic_user_card/basic_user_card.vue 1 addition, 1 deletionsrc/components/basic_user_card/basic_user_card.vue
- src/components/chat/chat.js 1 addition, 1 deletionsrc/components/chat/chat.js
- src/components/chat/chat.scss 3 additions, 3 deletionssrc/components/chat/chat.scss
- src/components/chat_title/chat_title.js 1 addition, 1 deletionsrc/components/chat_title/chat_title.js
- src/components/emoji_input/emoji_input.js 8 additions, 0 deletionssrc/components/emoji_input/emoji_input.js
- src/components/emoji_input/emoji_input.vue 1 addition, 1 deletionsrc/components/emoji_input/emoji_input.vue
- src/components/emoji_input/suggestor.js 2 additions, 2 deletionssrc/components/emoji_input/suggestor.js
- src/components/mfa_form/recovery_form.vue 2 additions, 2 deletionssrc/components/mfa_form/recovery_form.vue
- src/components/mfa_form/totp_form.vue 2 additions, 2 deletionssrc/components/mfa_form/totp_form.vue
- src/components/notification/notification.vue 5 additions, 5 deletionssrc/components/notification/notification.vue
- src/components/popover/popover.js 5 additions, 2 deletionssrc/components/popover/popover.js
- src/components/post_status_form/post_status_form.js 2 additions, 2 deletionssrc/components/post_status_form/post_status_form.js
- src/components/react_button/react_button.js 6 additions, 0 deletionssrc/components/react_button/react_button.js
- src/components/react_button/react_button.vue 1 addition, 0 deletionssrc/components/react_button/react_button.vue
- src/components/scope_selector/scope_selector.vue 4 additions, 4 deletionssrc/components/scope_selector/scope_selector.vue
- src/components/search/search.vue 1 addition, 1 deletionsrc/components/search/search.vue
- src/components/search_bar/search_bar.vue 3 additions, 3 deletionssrc/components/search_bar/search_bar.vue
- src/components/settings_modal/helpers/modified_indicator.vue 10 additions, 10 deletionssrc/components/settings_modal/helpers/modified_indicator.vue
Loading
Please register or sign in to comment