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

2017-09-12 18:40:20 +02:00
parent 437f50fd4a cce8811f9a
commit 8c41e0bdd6
5 changed files with 62 additions and 4 deletions
--- a/www/common/toolbar3.js
+++ b/www/common/toolbar3.js
@@ -183,7 +183,6 @@ define([

        // Update the userlist
        var $editUsers = $userlistContent.find('.' + USERLIST_CLS).html('');
-        Cryptpad.clearTooltips();

        var $editUsersList = $('<div>', {'class': 'cp-toolbar-userlist-others'});