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

2017-03-02 17:44:29 +01:00
parent e39fe1c0b7 52793385ea
commit 800db07077
49 changed files with 185 additions and 290 deletions
--- a/www/poll/index.html
+++ b/www/poll/index.html
@@ -11,11 +11,7 @@
        id="favicon" />
    <link rel="stylesheet" href="/bower_components/components-font-awesome/css/font-awesome.min.css">
    <link rel="stylesheet" href="/customize/main.css" />
-    <script data-main="main" src="/bower_components/requirejs/require.js"></script>
-    <script> require.config({
-        waitSeconds: 60,
-        urlArgs: "bust=1.1.0",
-    }); </script>
+    <script data-bootload="main.js" data-main="/common/boot.js" src="/bower_components/requirejs/require.js"></script>
    <style>
        html, body {
            width: 100%;