Merge branch 'develop' into 'themes-accent'
# Conflicts: # src/components/emoji_reactions/emoji_reactions.vue
No related branches found
No related tags found
Showing
- CHANGELOG.md 1 addition, 0 deletionsCHANGELOG.md
- src/App.scss 1 addition, 1 deletionsrc/App.scss
- src/_variables.scss 2 additions, 0 deletionssrc/_variables.scss
- src/components/emoji_reactions/emoji_reactions.js 44 additions, 4 deletionssrc/components/emoji_reactions/emoji_reactions.js
- src/components/emoji_reactions/emoji_reactions.vue 95 additions, 8 deletionssrc/components/emoji_reactions/emoji_reactions.vue
- src/components/interactions/interactions.js 1 addition, 0 deletionssrc/components/interactions/interactions.js
- src/components/interactions/interactions.vue 1 addition, 0 deletionssrc/components/interactions/interactions.vue
- src/components/mrf_transparency_panel/mrf_transparency_panel.js 9 additions, 1 deletion...mponents/mrf_transparency_panel/mrf_transparency_panel.js
- src/components/mrf_transparency_panel/mrf_transparency_panel.vue 43 additions, 0 deletions...ponents/mrf_transparency_panel/mrf_transparency_panel.vue
- src/components/notification/notification.vue 7 additions, 0 deletionssrc/components/notification/notification.vue
- src/components/notifications/notifications.scss 4 additions, 0 deletionssrc/components/notifications/notifications.scss
- src/components/react_button/react_button.js 6 additions, 1 deletionsrc/components/react_button/react_button.js
- src/components/react_button/react_button.vue 4 additions, 0 deletionssrc/components/react_button/react_button.vue
- src/components/settings/settings.vue 10 additions, 0 deletionssrc/components/settings/settings.vue
- src/components/status/status.js 10 additions, 0 deletionssrc/components/status/status.js
- src/components/status/status.vue 16 additions, 1 deletionsrc/components/status/status.vue
- src/components/user_settings/user_settings.js 2 additions, 0 deletionssrc/components/user_settings/user_settings.js
- src/components/user_settings/user_settings.vue 6 additions, 3 deletionssrc/components/user_settings/user_settings.vue
- src/i18n/en.json 15 additions, 2 deletionssrc/i18n/en.json
- src/i18n/fi.json 4 additions, 1 deletionsrc/i18n/fi.json
Loading
Please register or sign in to comment