Michael Telatynski 7fa38933cb Merge branches 'develop' and 't3chguy/electron-forward-back' of github.com:matrix-org/matrix-react-sdk into t3chguy/electron-forward-back ...

 Conflicts:

	src/components/structures/LoggedInView.tsx

2020-04-14 15:54:58 +01:00

..

structures

Merge branches 'develop' and 't3chguy/electron-forward-back' of github.com:matrix-org/matrix-react-sdk into t3chguy/electron-forward-back

2020-04-14 15:54:58 +01:00

views

Merge pull request #4403 from matrix-org/t3chguy/fix_e2ee_toggle

2020-04-14 13:17:31 +01:00