-
- Downloads
Merge branch 'develop' into 'iss-149/profile-fields-setting'
# Conflicts: # src/components/settings_modal/tabs/profile_tab.vue
No related branches found
No related tags found
Showing
- CHANGELOG.md 10 additions, 0 deletionsCHANGELOG.md
- package.json 2 additions, 5 deletionspackage.json
- src/components/account_actions/account_actions.vue 1 addition, 0 deletionssrc/components/account_actions/account_actions.vue
- src/components/domain_mute_card/domain_mute_card.js 11 additions, 0 deletionssrc/components/domain_mute_card/domain_mute_card.js
- src/components/domain_mute_card/domain_mute_card.vue 15 additions, 0 deletionssrc/components/domain_mute_card/domain_mute_card.vue
- src/components/emoji_input/suggestor.js 3 additions, 3 deletionssrc/components/emoji_input/suggestor.js
- src/components/extra_buttons/extra_buttons.vue 1 addition, 0 deletionssrc/components/extra_buttons/extra_buttons.vue
- src/components/gallery/gallery.vue 1 addition, 0 deletionssrc/components/gallery/gallery.vue
- src/components/media_upload/media_upload.js 0 additions, 14 deletionssrc/components/media_upload/media_upload.js
- src/components/media_upload/media_upload.vue 1 addition, 6 deletionssrc/components/media_upload/media_upload.vue
- src/components/notifications/notifications.scss 9 additions, 14 deletionssrc/components/notifications/notifications.scss
- src/components/poll/poll.vue 1 addition, 1 deletionsrc/components/poll/poll.vue
- src/components/popover/popover.js 9 additions, 2 deletionssrc/components/popover/popover.js
- src/components/post_status_form/post_status_form.js 18 additions, 2 deletionssrc/components/post_status_form/post_status_form.js
- src/components/post_status_form/post_status_form.vue 42 additions, 4 deletionssrc/components/post_status_form/post_status_form.vue
- src/components/post_status_modal/post_status_modal.js 3 additions, 0 deletionssrc/components/post_status_modal/post_status_modal.js
- src/components/post_status_modal/post_status_modal.vue 1 addition, 0 deletionssrc/components/post_status_modal/post_status_modal.vue
- src/components/settings_modal/tabs/mutes_and_blocks_tab.js 20 additions, 8 deletionssrc/components/settings_modal/tabs/mutes_and_blocks_tab.js
- src/components/settings_modal/tabs/mutes_and_blocks_tab.vue 8 additions, 13 deletionssrc/components/settings_modal/tabs/mutes_and_blocks_tab.vue
- src/components/settings_modal/tabs/profile_tab.js 2 additions, 0 deletionssrc/components/settings_modal/tabs/profile_tab.js
Loading
Please register or sign in to comment