Merge branch 'staging' into inviteUI

2019-12-18 15:12:43 +01:00
parent 091ffc6070 a34aad78ab
commit e6e1ef72e7
21 changed files with 577 additions and 177 deletions
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -4157,7 +4157,7 @@ define([
        };

        var content = h('div.cp-share-modal', [
-            setHTML(h('p'), text)
+            setHTML(h('p'), text),
        ]);
        UI.proposal(content, todo);
    };