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

2017-06-30 16:57:37 +02:00
parent b153dda6ff c2e153e8ed
commit f357ec32c2
3 changed files with 23 additions and 37 deletions
--- a/www/whiteboard/index.html
+++ b/www/whiteboard/index.html
@@ -4,7 +4,6 @@
    <meta content="text/html; charset=utf-8" http-equiv="content-type"/>
    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
    <script async data-bootload="/customize/template.js" data-main="/common/boot.js?ver=1.0" src="/bower_components/requirejs/require.js?ver=2.1.15"></script>
-    <style> .noscroll { overflow-y: hidden; } </style>
 </head>
-<body class='noscroll'>
+<body>