aboutsummaryrefslogtreecommitdiff
path: root/src/components/user_settings/user_settings.vue
diff options
context:
space:
mode:
authordave <starpumadev@gmail.com>2019-03-25 10:22:16 -0400
committerdave <starpumadev@gmail.com>2019-03-25 10:22:16 -0400
commit4cec0d589dfc54987ec6f024b0a463d0abd847d2 (patch)
treea88953cc409d162127edb43a702d6540c64c023e /src/components/user_settings/user_settings.vue
parent63d7c7bd80cf8028cdefee99c1cb75614385f96b (diff)
parent01d05316998f90451e920f8ac8d4c264a13b0cd7 (diff)
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into issue-433-status-reply-form
Diffstat (limited to 'src/components/user_settings/user_settings.vue')
-rw-r--r--src/components/user_settings/user_settings.vue6
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>