manual merge of staging

2017-07-13 10:30:42 +02:00
parent 25905d13fa 607d4fa57e
commit f6abdc2b86
61 changed files with 805 additions and 739 deletions
--- a/customize.dist/pages.js
+++ b/customize.dist/pages.js
@@ -444,7 +444,7 @@ define([
                h('div#poll', [
                    h('div#howItWorks', [
                        h('h1', 'CryptPoll'),
-                        h('h2', Msg.poll_subtitle),
+                        setHTML(h('h2'), Msg.poll_subtitle),
                        h('p', Msg.poll_p_save),
                        h('p', Msg.poll_p_encryption)
                    ]),