matrix-react-sdk

54561b65 - Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into develop

Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into develop Conflicts: src/i18n/strings/bg.json src/i18n/strings/da.json src/i18n/strings/de_DE.json src/i18n/strings/eo.json src/i18n/strings/eu.json src/i18n/strings/gl.json src/i18n/strings/it.json src/i18n/strings/ja.json src/i18n/strings/nl.json src/i18n/strings/pl.json src/i18n/strings/ru.json src/i18n/strings/sk.json src/i18n/strings/zh_Hans.json