Merge branch 'soon' into staging

2019-11-08 09:31:38 -05:00
parent 553f68fce8 5b22406dd7
commit 05827d9202
5 changed files with 55 additions and 3 deletions
--- a/www/common/sframe-common-outer.js
+++ b/www/common/sframe-common-outer.js
@@ -511,7 +511,7 @@ define([
                    path: initialPathInDrive // Where to store the pad if we don't have it in our drive
                };
                Cryptpad.setPadTitle(data, function (err) {
-                    cb(err);
+                    cb({error: err});
                });
            });
            sframeChan.on('EV_SET_TAB_TITLE', function (newTabTitle) {