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

2018-01-29 14:26:42 +01:00
parent 8e2c9ebfa3 b6e91c772e
commit 66f1b55d9a
5 changed files with 54 additions and 46 deletions
@@ -906,6 +906,8 @@ define([
        var userObject = store.userObject = UserObject.init(proxy.drive, {
            pinPads: Store.pinPads,
            unpinPads: Store.unpinPads,
+            removeOwnedChannel: function () {}, // XXX
+            edPublic: store.proxy.edPublic,
            loggedIn: store.loggedIn,
            log: function (msg) {
                postMessage("DRIVE_LOG", msg);