matrix-react-sdk

34c9bbfd - Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/delintify

Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/delintify Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> # Conflicts: # src/components/views/rooms/RoomHeader.js