Merge remote-tracking branch 'origin/develop' into dbkr/fix_slash_join

2017-09-14 23:09:26 +01:00 · 2017-09-14 23:09:26 +01:00 · f3a4856593
commit f3a4856593
parent 1f837d2ae1 94ec11d3e1
3 changed files with 3 additions and 2 deletions
--- a/src/stores/RoomViewStore.js
+++ b/src/stores/RoomViewStore.js
@ -158,6 +158,7 @@ class RoomViewStore extends Store {
                    highlighted: payload.highlighted,
                    room_alias: payload.room_alias,
                    auto_join: payload.auto_join,
+                    oob_data: payload.oob_data,
                });
            }, (err) => {
                dis.dispatch({