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

2019-11-25 17:07:26 +01:00 · 2019-11-25 17:07:26 +01:00 · c1c000149b
parent ff6de41bec 9efceb2234
commit c1c000149b
1 changed files with 0 additions and 2 deletions
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@ -683,8 +683,6 @@ define([
            }));
        }

-        // XXX problem with the hardcoded ": " here
-        // possibly duplicate translation keys 
        if (data.tags && Array.isArray(data.tags)) {
            $d.append(h('div.cp-app-prop', [Messages.fm_prop_tagsList, h('br'), h('span.cp-app-prop-content', data.tags.join(', '))]));
        }