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

2016-09-23 16:07:46 +02:00
parent a82b7aaf8b 37c3f12790
commit a4843cb5d7
2 changed files with 3 additions and 2 deletions
--- a/www/slide/main.js
+++ b/www/slide/main.js
@@ -322,7 +322,7 @@ define([
        elem.selectionStart = selects[0];
        elem.selectionEnd = selects[1];

-        Slide.update(content);
+        Slide.update(userDoc);

        notify();
    };