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

customize.dist/src/less2/include/messenger.less

@@ -136,6 +136,19 @@
             }
         }
     }
+
+    .cp-contacts-muted-table {
+        .cp-contacts-muted-user {
+            margin-bottom: 5px;
+            .cp-avatar {
+                margin-right: 10px;
+            }
+            button {
+                margin-right: 0px;
+            }
+        }
+    }
+
     #cp-app-contacts-container.cp-app-contacts-inapp {
         #cp-app-contacts-friendlist {
             display: none;

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')
             ]),