Michael Telatynski 02f8b18346 Merge branch 't3chguy/nvl/userinfo' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/nvl/userinfo ... Conflicts: src/components/views/right_panel/UserInfo.js		2019-10-19 16:42:00 +01:00
..
GroupHeaderButtons.js	take buttons into account that are active over multiple phases when toggling	2019-04-11 13:31:21 +02:00
HeaderButton.js	Various ARIA a11y fixes.	2019-10-03 09:35:39 +01:00
HeaderButtons.js	Various ARIA a11y fixes.	2019-10-03 09:35:39 +01:00
RoomHeaderButtons.js	take buttons into account that are active over multiple phases when toggling	2019-04-11 13:31:21 +02:00
UserInfo.js	Merge branch 't3chguy/nvl/userinfo' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/nvl/userinfo	2019-10-19 16:42:00 +01:00