aboutsummaryrefslogtreecommitdiff
path: root/src/components/user_settings/user_settings.vue
diff options
context:
space:
mode:
authorshpuld <shp@cock.li>2019-03-28 22:25:40 +0200
committershpuld <shp@cock.li>2019-03-28 22:25:40 +0200
commit31010779f6cc1abdd18fa117c0832e20623e1624 (patch)
tree2eaf8861e1baee86a1f4d33e0e10543e62cdd98c /src/components/user_settings/user_settings.vue
parentfd12263cacd2a869ad61dd8580f918b45d9b2a51 (diff)
parentc829b1a5f4a013882ba298b0f95ec0f8b3ed3758 (diff)
Merge branch 'develop' into feature/mobile-improvements-3
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>