From 91771ec17d84b95220158f6612bfd99099c714d0 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Sat, 1 Oct 2016 10:34:21 +0100
Subject: [PATCH] Ce n'est pas Python

---
 src/components/structures/MatrixChat.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index 35881ee3dc..0f8f5e5de6 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -256,7 +256,7 @@ module.exports = React.createClass({
             upgradeUsername: null,
             guestAccessToken: null,
        };
-       newState.update(state);
+       Object.assign(newState, state);
        this.setState(newState);
     },