diff options
| author | HJ <30-hj@users.noreply.git.pleroma.social> | 2019-03-24 17:15:21 +0000 |
|---|---|---|
| committer | HJ <30-hj@users.noreply.git.pleroma.social> | 2019-03-24 17:15:21 +0000 |
| commit | 01d05316998f90451e920f8ac8d4c264a13b0cd7 (patch) | |
| tree | 99730bd30e73e6dc1b81eba924426425ace0fa5f /src/components/user_settings/user_settings.vue | |
| parent | f86a5dc80421f496a893efaa98f12f831da0adcb (diff) | |
| parent | f03747e84124ea45efd16a2f386d7f14996f736a (diff) | |
Merge branch '227-manage-blocks-mutes' into 'develop'
Transition to MastoAPI: Mute & Block and Add Mutes management tab
See merge request pleroma/pleroma-fe!611
Diffstat (limited to 'src/components/user_settings/user_settings.vue')
| -rw-r--r-- | src/components/user_settings/user_settings.vue | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/components/user_settings/user_settings.vue b/src/components/user_settings/user_settings.vue index a1123638..c9e68808 100644 --- a/src/components/user_settings/user_settings.vue +++ b/src/components/user_settings/user_settings.vue @@ -192,6 +192,12 @@ <template slot="empty">{{$t('settings.no_blocks')}}</template> </block-list> </div> + + <div :label="$t('settings.mutes_tab')"> + <mute-list :refresh="true"> + <template slot="empty">{{$t('settings.no_mutes')}}</template> + </mute-list> + </div> </tab-switcher> </div> </div> |