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

2017-08-16 12:35:13 +02:00
parent 7c49ca6e3f 2874ccb5dc
commit e7ef1e1c2b
2 changed files with 3 additions and 1 deletions
--- a/www/code/main.js
+++ b/www/code/main.js
@@ -410,6 +410,7 @@ define([
                    }
                });

+/*
                // add the splitter
                if (!$iframe.has('.cp-splitter').length) {
                    var $preview = $iframe.find('#previewContainer');
@@ -437,6 +438,7 @@ define([
                        });
                    });
                }
+*/

                Cryptpad.removeLoadingScreen();
                setEditable(true);