Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging

2019-12-17 17:57:28 +01:00
parent 215cabc053 03cf969c41
commit 5b8eb1c070
2 changed files with 14 additions and 1 deletions
--- a/www/common/messenger-ui.js
+++ b/www/common/messenger-ui.js
@@ -72,7 +72,7 @@ define([
            h('div.cp-app-contacts-friends.cp-app-contacts-category', [
                h('button.cp-app-contacts-muted-button',[
                    h('i.fa.fa-bell-slash'),
-                    Messages.contacts_manageMuted || 'MANAGE MUTED' // XXX
+                    Messages.contacts_manageMuted
                ]), 
                h('div.cp-app-contacts-category-content.cp-contacts-friends')
            ]),