Michael Telatynski 34c9bbfd86 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		2017-07-03 19:15:38 +01:00
..
structures	Simplify boolean assignment.	2017-06-28 12:21:05 +01:00
views	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/delintify	2017-07-03 19:15:38 +01:00