matrix-react-sdk

8967871b - Merge branches 'develop' and 't3chguy/pl_control_e2e' of github.com:matrix-org/matrix-react-sdk into t3chguy/pl_control_e2e

Merge branches 'develop' and 't3chguy/pl_control_e2e' of github.com:matrix-org/matrix-react-sdk into t3chguy/pl_control_e2e
Conflicts:
src/components/views/settings/tabs/room/RolesRoomSettingsTab.js
src/i18n/strings/en_EN.json